From: zyc <zyc@rock-chips.com>
Date: Tue, 9 Oct 2012 02:41:34 +0000 (+0800)
Subject: camera: fix gpio request erro of setting multiple camera.
X-Git-Tag: firefly_0821_release~8475
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6e078d3fcc1c1c7b3dfb80e23586954d2dca4b9a;p=firefly-linux-kernel-4.4.55.git

camera: fix gpio request erro of setting multiple camera.
---

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