From cff0c4640457e186c79384fc7fff05e1baf267fd Mon Sep 17 00:00:00 2001 From: root Date: Fri, 24 Aug 2012 11:20:34 +0800 Subject: [PATCH] camera rk30: vipmem_virbase is not setted , fix it. --- drivers/media/video/rk30_camera.c | 3 ++- drivers/media/video/rk30_camera_oneframe.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/rk30_camera.c b/drivers/media/video/rk30_camera.c index a8aaa9d164b1..909c7c396a92 100755 --- a/drivers/media/video/rk30_camera.c +++ b/drivers/media/video/rk30_camera.c @@ -1504,7 +1504,8 @@ static void rk_init_camera_plateform_data(void) static void rk30_camera_request_reserve_mem(void) { -#ifdef CONFIG_VIDEO_RK29_WORK_IPP +#ifdef CONFIG_VIDEO_RK29_WORK_IPP + rk_camera_platform_data.meminfo.vbase = rk_camera_platform_data.meminfo_cif1.vbase = NULL; #if defined(CONFIG_VIDEO_RKCIF_WORK_SIMUL_OFF) || ((RK_SUPPORT_CIF0 && RK_SUPPORT_CIF1) == false) rk_camera_platform_data.meminfo.name = "camera_ipp_mem"; rk_camera_platform_data.meminfo.start = board_mem_reserve_add("camera_ipp_mem",PMEM_CAMIPP_NECESSARY); diff --git a/drivers/media/video/rk30_camera_oneframe.c b/drivers/media/video/rk30_camera_oneframe.c index b04690fe24ee..9e6e84efc9b4 100755 --- a/drivers/media/video/rk30_camera_oneframe.c +++ b/drivers/media/video/rk30_camera_oneframe.c @@ -2952,7 +2952,7 @@ static int rk_camera_probe(struct platform_device *pdev) pcdev->vipmem_phybase = meminfo_ptr->start; pcdev->vipmem_size = meminfo_ptr->size; - pcdev->pdata->meminfo.vbase = meminfo_ptr->vbase; + pcdev->vipmem_virbase = meminfo_ptr->vbase; #endif INIT_LIST_HEAD(&pcdev->capture); INIT_LIST_HEAD(&pcdev->camera_work_queue); -- 2.34.1