camera: fix some invalidate warning in compile for rk29_camera.c
authorddl <ddl@rockchip.com>
Tue, 31 May 2011 09:23:20 +0000 (17:23 +0800)
committerddl <ddl@rockchip.com>
Tue, 31 May 2011 09:23:55 +0000 (17:23 +0800)
drivers/media/video/rk29_camera.c

index 9ef1af5db9225cad83d1e1662713695f7d2ea864..7a17f7fa513c5b2a625e784444b7bd74d909d6a3 100755 (executable)
@@ -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;    \r
+    struct rk29camera_gpio_res *res = NULL;    \r
        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];\r
     } 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];\r
-    }
+    } else {\r
+        printk(KERN_ERR "%s is not regisiterd in rk29_camera_platform_data!!\n",dev_name(dev));\r
+        ret = RK29_CAM_EIO_INVALID;\r
+        goto rk29_sensor_ioctrl_end;\r
+    }\r
 
        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;
                }
-       }
+       }\r
+rk29_sensor_ioctrl_end:\r
     return ret;
 }
 static int rk29_sensor_power(struct device *dev, int on)
 {
        rk29_sensor_ioctrl(dev,Cam_Power,on);
     return 0;
-}
+}\r
+#if 0\r
 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;
-}
+}\r
+#endif\r
 static int rk29_sensor_powerdown(struct device *dev, int on)
 {
        return rk29_sensor_ioctrl(dev,Cam_PowerDown,on);