From: ddl <ddl@rockchip.com>
Date: Tue, 31 May 2011 09:23:20 +0000 (+0800)
Subject: camera: fix some invalidate warning in compile for rk29_camera.c
X-Git-Tag: firefly_0821_release~10253
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=98f2d7f3a53c2fe3aa7476b97d1d7a19dd193106;p=firefly-linux-kernel-4.4.55.git

camera: fix some invalidate warning in compile for rk29_camera.c
---

diff --git a/drivers/media/video/rk29_camera.c b/drivers/media/video/rk29_camera.c
index 9ef1af5db922..7a17f7fa513c 100755
--- a/drivers/media/video/rk29_camera.c
+++ b/drivers/media/video/rk29_camera.c
@@ -362,14 +362,18 @@ static int rk29_sensor_io_deinit(int sensor)
 }
 static int rk29_sensor_ioctrl(struct device *dev,enum rk29camera_ioctrl_cmd cmd, int on)
 {
-    struct rk29camera_gpio_res *res;    
+    struct rk29camera_gpio_res *res = NULL;    
 	int ret = RK29_CAM_IO_SUCCESS;
 
     if(rk29_camera_platform_data.gpio_res[0].dev_name &&  (strcmp(rk29_camera_platform_data.gpio_res[0].dev_name, dev_name(dev)) == 0)) {
 		res = (struct rk29camera_gpio_res *)&rk29_camera_platform_data.gpio_res[0];
     } else if (rk29_camera_platform_data.gpio_res[1].dev_name && (strcmp(rk29_camera_platform_data.gpio_res[1].dev_name, dev_name(dev)) == 0)) {
     	res = (struct rk29camera_gpio_res *)&rk29_camera_platform_data.gpio_res[1];
-    }
+    } else {
+        printk(KERN_ERR "%s is not regisiterd in rk29_camera_platform_data!!\n",dev_name(dev));
+        ret = RK29_CAM_EIO_INVALID;
+        goto rk29_sensor_ioctrl_end;
+    }
 
  	switch (cmd)
  	{
@@ -421,21 +425,24 @@ static int rk29_sensor_ioctrl(struct device *dev,enum rk29camera_ioctrl_cmd cmd,
 			printk("%s cmd(0x%x) is unknown!\n",__FUNCTION__, cmd);
 			break;
 		}
- 	}
+ 	}
+rk29_sensor_ioctrl_end:
     return ret;
 }
 static int rk29_sensor_power(struct device *dev, int on)
 {
 	rk29_sensor_ioctrl(dev,Cam_Power,on);
     return 0;
-}
+}
+#if 0
 static int rk29_sensor_reset(struct device *dev)
 {
 	rk29_sensor_ioctrl(dev,Cam_Reset,1);
 	msleep(2);
 	rk29_sensor_ioctrl(dev,Cam_Reset,0);
 	return 0;
-}
+}
+#endif
 static int rk29_sensor_powerdown(struct device *dev, int on)
 {
 	return rk29_sensor_ioctrl(dev,Cam_PowerDown,on);