camera: fix gpio request erro of setting multiple camera.
authorzyc <zyc@rock-chips.com>
Tue, 9 Oct 2012 02:41:34 +0000 (10:41 +0800)
committerzyc <zyc@rock-chips.com>
Tue, 9 Oct 2012 02:41:59 +0000 (10:41 +0800)
arch/arm/plat-rk/rk_camera.c

index f8b8062ab8af8004f546d46500c8e26c1b473e03..cacfd4df77e8f227251deea2d675dbddb438bb43 100755 (executable)
@@ -1038,10 +1038,11 @@ static int rk_sensor_io_init(void)
                 if (i==j) {\r
                     printk(KERN_ERR"rk_cam_io: %s..%s..reset pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_reset);\r
                     goto sensor_io_init_erro;\r
-                }\r
+                }else{\r
                 \r
                 printk("%s..%s..reset pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_reset);\r
-                goto sensor_io_init_erro;\r
+                //goto sensor_io_init_erro;\r
+                               }\r
             }\r
 \r
             if (rk_camera_platform_data.iomux(camera_reset) < 0) {\r
@@ -1068,9 +1069,10 @@ static int rk_sensor_io_init(void)
                 if (i==j) {\r
                     printk(KERN_ERR"rk_cam_io: %s..%s..powerdown pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_powerdown);\r
                     goto sensor_io_init_erro;\r
-                }\r
+                }else{\r
                 printk("%s..%s..powerdown pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_powerdown);\r
-                goto sensor_io_init_erro;\r
+                //goto sensor_io_init_erro;\r
+                               }\r
             }\r
 \r
             if (rk_camera_platform_data.iomux(camera_powerdown) < 0) {\r
@@ -1097,9 +1099,9 @@ static int rk_sensor_io_init(void)
                 if (i==j) {\r
                     printk(KERN_ERR"rk_cam_io: %s..%s..flash pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_flash);\r
                     goto sensor_io_init_erro;\r
-                }\r
+                }else{\r
                 printk("%s..%s..flash pin(%d) init failed\n",__FUNCTION__,plat_data->gpio_res[i].dev_name,camera_flash);\r
-                               goto sensor_io_init_erro;\r
+                               }\r
             }\r
 \r
             if (rk_camera_platform_data.iomux(camera_flash) < 0) {\r