1 files changed, 12 insertions, 18 deletions

diff --git a/drivers/media/i2c/soc_camera/ov6650.c b/drivers/media/i2c/soc_camera/ov6650.c
index e87feb0881e3..dbe4f564e6b2 100644
--- a/drivers/media/i2c/soc_camera/ov6650.c
+++ b/drivers/media/i2c/soc_camera/ov6650.c
@@ -435,9 +435,9 @@ static int ov6650_set_register(struct v4l2_subdev *sd,
 static int ov6650_s_power(struct v4l2_subdev *sd, int on)
 {
         struct i2c_client *client = v4l2_get_subdevdata(sd);
-        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);
 
-        return soc_camera_set_power(&client->dev, icl, on);
+        return soc_camera_set_power(&client->dev, ssdd, on);
 }
 
 static int ov6650_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
@@ -892,7 +892,7 @@ static int ov6650_g_mbus_config(struct v4l2_subdev *sd,
                                 struct v4l2_mbus_config *cfg)
 {
         struct i2c_client *client = v4l2_get_subdevdata(sd);
-        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);
 
         cfg->flags = V4L2_MBUS_MASTER |
                 V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_PCLK_SAMPLE_FALLING |
@@ -900,7 +900,7 @@ static int ov6650_g_mbus_config(struct v4l2_subdev *sd,
                 V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_LOW |
                 V4L2_MBUS_DATA_ACTIVE_HIGH;
         cfg->type = V4L2_MBUS_PARALLEL;
-        cfg->flags = soc_camera_apply_board_flags(icl, cfg);
+        cfg->flags = soc_camera_apply_board_flags(ssdd, cfg);
 
         return 0;
 }
@@ -910,8 +910,8 @@ static int ov6650_s_mbus_config(struct v4l2_subdev *sd,
                                 const struct v4l2_mbus_config *cfg)
 {
         struct i2c_client *client = v4l2_get_subdevdata(sd);
-        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
-        unsigned long flags = soc_camera_apply_board_flags(icl, cfg);
+        struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);
+        unsigned long flags = soc_camera_apply_board_flags(ssdd, cfg);
         int ret;
 
         if (flags & V4L2_MBUS_PCLK_SAMPLE_RISING)
@@ -963,15 +963,15 @@ static int ov6650_probe(struct i2c_client *client,
                         const struct i2c_device_id *did)
 {
         struct ov6650 *priv;
-        struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
+        struct soc_camera_subdev_desc *ssdd = soc_camera_i2c_to_desc(client);
         int ret;
 
-        if (!icl) {
+        if (!ssdd) {
                 dev_err(&client->dev, "Missing platform_data for driver\n");
                 return -EINVAL;
         }
 
-        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        priv = devm_kzalloc(&client->dev, sizeof(*priv), GFP_KERNEL);
         if (!priv) {
                 dev_err(&client->dev,
                         "Failed to allocate memory for private data!\n");
@@ -1009,12 +1009,9 @@ static int ov6650_probe(struct i2c_client *client,
                         V4L2_CID_GAMMA, 0, 0xff, 1, 0x12);
 
         priv->subdev.ctrl_handler = &priv->hdl;
-        if (priv->hdl.error) {
-                int err = priv->hdl.error;
+        if (priv->hdl.error)
+                return priv->hdl.error;
 
-                kfree(priv);
-                return err;
-        }
         v4l2_ctrl_auto_cluster(2, &priv->autogain, 0, true);
         v4l2_ctrl_auto_cluster(3, &priv->autowb, 0, true);
         v4l2_ctrl_auto_cluster(2, &priv->autoexposure,
@@ -1029,10 +1026,8 @@ static int ov6650_probe(struct i2c_client *client,
         priv->colorspace  = V4L2_COLORSPACE_JPEG;
 
         ret = ov6650_video_probe(client);
-        if (ret) {
+        if (ret)
                 v4l2_ctrl_handler_free(&priv->hdl);
-                kfree(priv);
-        }
 
         return ret;
 }
@@ -1043,7 +1038,6 @@ static int ov6650_remove(struct i2c_client *client)
 
         v4l2_device_unregister_subdev(&priv->subdev);
         v4l2_ctrl_handler_free(&priv->hdl);
-        kfree(priv);
         return 0;
 }