From 6e078d3fcc1c1c7b3dfb80e23586954d2dca4b9a Mon Sep 17 00:00:00 2001 From: zyc Date: Tue, 9 Oct 2012 10:41:34 +0800 Subject: [PATCH] camera: fix gpio request erro of setting multiple camera. --- arch/arm/plat-rk/rk_camera.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/arm/plat-rk/rk_camera.c b/arch/arm/plat-rk/rk_camera.c index f8b8062ab8af..cacfd4df77e8 100755 --- a/arch/arm/plat-rk/rk_camera.c +++ b/arch/arm/plat-rk/rk_camera.c @@ -1038,10 +1038,11 @@ static int rk_sensor_io_init(void) if (i==j) { printk(KERN_ERR"rk_cam_io: %s..%s..reset pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_reset); goto sensor_io_init_erro; - } + }else{ printk("%s..%s..reset pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_reset); - goto sensor_io_init_erro; + //goto sensor_io_init_erro; + } } if (rk_camera_platform_data.iomux(camera_reset) < 0) { @@ -1068,9 +1069,10 @@ static int rk_sensor_io_init(void) if (i==j) { printk(KERN_ERR"rk_cam_io: %s..%s..powerdown pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_powerdown); goto sensor_io_init_erro; - } + }else{ printk("%s..%s..powerdown pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_powerdown); - goto sensor_io_init_erro; + //goto sensor_io_init_erro; + } } if (rk_camera_platform_data.iomux(camera_powerdown) < 0) { @@ -1097,9 +1099,9 @@ static int rk_sensor_io_init(void) if (i==j) { printk(KERN_ERR"rk_cam_io: %s..%s..flash pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_flash); goto sensor_io_init_erro; - } + }else{ printk("%s..%s..flash pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_flash); - goto sensor_io_init_erro; + } } if (rk_camera_platform_data.iomux(camera_flash) < 0) { -- 2.34.1