camera rk30: vipmem_virbase is not setted , fix it.

diff --git a/drivers/media/video/rk30_camera.c b/drivers/media/video/rk30_camera.c
index a8aaa9d164b17be9fc956cf7c247601d8cd5d972..909c7c396a92d795b5b854a17ed8229a595accb7 100755 (executable)
--- 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)
 \r
 static void rk30_camera_request_reserve_mem(void)\r
 {\r
-#ifdef CONFIG_VIDEO_RK29_WORK_IPP    \r
+#ifdef CONFIG_VIDEO_RK29_WORK_IPP\r
+        rk_camera_platform_data.meminfo.vbase = rk_camera_platform_data.meminfo_cif1.vbase = NULL;\r
     #if defined(CONFIG_VIDEO_RKCIF_WORK_SIMUL_OFF) || ((RK_SUPPORT_CIF0 && RK_SUPPORT_CIF1) == false)\r
         rk_camera_platform_data.meminfo.name = "camera_ipp_mem";\r
         rk_camera_platform_data.meminfo.start = board_mem_reserve_add("camera_ipp_mem",PMEM_CAMIPP_NECESSARY);\r

diff --git a/drivers/media/video/rk30_camera_oneframe.c b/drivers/media/video/rk30_camera_oneframe.c
index b04690fe24ee92dc7b93ab8b3117e48e71e655fb..9e6e84efc9b4fb67c9afe0113beee01c5867acdd 100755 (executable)
--- 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);