camera: oneframe v0.1.f

diff --git a/drivers/media/video/generic_sensor.c b/drivers/media/video/generic_sensor.c
index 6866e39e4e7228c0c09bbd1e7bf6ba6e1fcd606a..31e86adc93675c0179a3b1cc83a896ead92c6de6 100755 (executable)
--- a/drivers/media/video/generic_sensor.c
+++ b/drivers/media/video/generic_sensor.c
@@ -1278,7 +1278,9 @@ int generic_sensor_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
  static void sensor_af_workqueue(struct work_struct *work)
 {
        struct rk_sensor_focus_work *sensor_work = container_of(work, struct rk_sensor_focus_work, dwork.work);
-       struct i2c_client *client = sensor_work->client;
+       struct i2c_client *client = sensor_work->client;        
+    struct soc_camera_subdev_desc *ssdd = client->dev.platform_data;
+       struct soc_camera_device *icd = ssdd->socdev;
        struct generic_sensor*sensor = to_generic_sensor(client);
        //struct rk_sensor_focus_cmd_info cmdinfo;
        int zone_tm_pos[4];
@@ -1298,7 +1300,7 @@ int generic_sensor_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
                                SENSOR_TR("WqCmd_af_init is failed in sensor_af_workqueue!");
                        } else {
                                if(sensor->sensor_focus.focus_delay != WqCmd_af_invalid) {
-                                       generic_sensor_af_workqueue_set(client->dev.platform_data,sensor->sensor_focus.focus_delay,0,false);
+                                       generic_sensor_af_workqueue_set(icd,sensor->sensor_focus.focus_delay,0,false);
                                        sensor->sensor_focus.focus_delay = WqCmd_af_invalid;
                                }
                     sensor->sensor_focus.focus_state = FocusState_Inited;

diff --git a/drivers/media/video/rk30_camera_oneframe.c b/drivers/media/video/rk30_camera_oneframe.c
index 7f795d7aa715ebff0e756c23695dc10beb32bfb0..f7f081f74eb5f6e04d52dc913f6104efc9721e4f 100755 (executable)
--- a/drivers/media/video/rk30_camera_oneframe.c
+++ b/drivers/media/video/rk30_camera_oneframe.c
@@ -293,8 +293,10 @@ static u32 CHIP_NAME;
                 1. use of_find_node_by_name to get vpu node instead of of_find_compatible_node 
 *v0.1.e:
                 1. support focus mode.
+*v0.1.f:
+         1. focus mode have some bug,fix it.
 */
-#define RK_CAM_VERSION_CODE KERNEL_VERSION(0, 1, 0xe)
+#define RK_CAM_VERSION_CODE KERNEL_VERSION(0, 1, 0xf)
 static int version = RK_CAM_VERSION_CODE;
 module_param(version, int, S_IRUGO);