shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 04:48:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

camera rk30: vipmem_virbase is not setted , fix it.

Browse Source
This commit is contained in:
root
2012-08-24 11:20:34 +08:00
parent 954138eee2
commit cff0c46404
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/video/rk30_camera.c
View File

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

2
drivers/media/video/rk30_camera_oneframe.c
View File

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