From: root <root@zyc-desktop.(none)>
Date: Fri, 24 Aug 2012 03:20:34 +0000 (+0800)
Subject: camera rk30: vipmem_virbase is not setted , fix it.
X-Git-Tag: firefly_0821_release~8846
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cff0c4640457e186c79384fc7fff05e1baf267fd;p=firefly-linux-kernel-4.4.55.git

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 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);