From: dalon.zhang <dalon.zhang@rock-chips.com>
Date: Thu, 14 May 2015 03:11:44 +0000 (+0800)
Subject: camsys_drv: v0.0x1f.0
X-Git-Tag: firefly_0821_release~4174
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=fabdd7f607fd90cd6163dfb373576e5ba4d8079b

camsys_drv: v0.0x1f.0
---

diff --git a/drivers/media/video/rk_camsys/camsys_internal.h b/drivers/media/video/rk_camsys/camsys_internal.h
index 70f525959a4a..a8c277f94d5d 100755
--- a/drivers/media/video/rk_camsys/camsys_internal.h
+++ b/drivers/media/video/rk_camsys/camsys_internal.h
@@ -118,8 +118,10 @@
 *v0.0x1e.0:
          1) dts remove aclk_rga, change aclk_isp from <clk_gates17 0> to <&clk_gates16 0>.
          2) add rl3369 pd_isp enable/disable.
+*v0.0x1f.0:
+		 1) GPIO(gpio7 GPIO_B5) is EBUSY when register after factory reset, but after power on ,it's normal.
 */
-#define CAMSYS_DRIVER_VERSION                   KERNEL_VERSION(0,0x1e,0)
+#define CAMSYS_DRIVER_VERSION                   KERNEL_VERSION(0,0x1f,0)
 
 
 #define CAMSYS_PLATFORM_DRV_NAME                "RockChip-CamSys"
diff --git a/drivers/media/video/rk_camsys/ext_flashled_drv/leds-rt8547.c b/drivers/media/video/rk_camsys/ext_flashled_drv/leds-rt8547.c
index f4cdc7e87023..84d1618a70fd 100755
--- a/drivers/media/video/rk_camsys/ext_flashled_drv/leds-rt8547.c
+++ b/drivers/media/video/rk_camsys/ext_flashled_drv/leds-rt8547.c
@@ -728,13 +728,16 @@ static int rt8547_io_init(struct rt8547_platform_data *pdata,
 				      "rt8547_flset");
 		if (rc < 0) {
 			dev_err(dev, "request rt8547 flash set pin fail\n");
-			goto gpio_request3;
+			/*GPIO(gpio7 GPIO_B5) is EBUSY when register after factory data reset, but after power on ,it's  normal*/
+			/*goto gpio_request3;*/
 		}
 	}
 	return 0;
+/*
 gpio_request3:
     if(gpio_is_valid(pdata->ctl_gpio))
     	gpio_free(pdata->ctl_gpio);
+*/
 gpio_request2:
     if (gpio_is_valid(pdata->flen_gpio))
     	gpio_free(pdata->flen_gpio);
diff --git a/drivers/media/video/rk_camsys/ext_flashled_drv/rk_ext_fshled_ctl.c b/drivers/media/video/rk_camsys/ext_flashled_drv/rk_ext_fshled_ctl.c
index 8d1101930b6e..1f1cb0663fee 100755
--- a/drivers/media/video/rk_camsys/ext_flashled_drv/rk_ext_fshled_ctl.c
+++ b/drivers/media/video/rk_camsys/ext_flashled_drv/rk_ext_fshled_ctl.c
@@ -138,6 +138,10 @@ int camsys_ext_fsh_ctrl(void* dev,int mode,unsigned int on)
     }
 
     fled_dev = find_flashlight_by_name(cur_fsh_info->dev_model);
+	if(fled_dev == NULL){
+		camsys_err("--find_flashlight_by_name return NULL!--");
+		return -1;
+	}
     switch(mode){
         case 0: /* off */
            /* set flashlight mode to Off */