2 files changed, 5 insertions, 5 deletions

diff --git a/drivers/media/video/ov772x.c b/drivers/media/video/ov772x.c
index 205229333466..dcb690cb5ae7 100644
--- a/drivers/media/video/ov772x.c
+++ b/drivers/media/video/ov772x.c
@@ -1143,10 +1143,10 @@ static int ov772x_probe(struct i2c_client *client,
         }
 
         icl = to_soc_camera_link(icd);
-        if (!icl)
+        if (!icl || !icl->priv)
                 return -EINVAL;
 
-        info = container_of(icl, struct ov772x_camera_info, link);
+        info = icl->priv;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
                 dev_err(&adapter->dev,
diff --git a/drivers/media/video/tw9910.c b/drivers/media/video/tw9910.c
index 3cb9ba6caa41..35373d8bf6a0 100644
--- a/drivers/media/video/tw9910.c
+++ b/drivers/media/video/tw9910.c
@@ -955,10 +955,10 @@ static int tw9910_probe(struct i2c_client *client,
         }
 
         icl = to_soc_camera_link(icd);
-        if (!icl)
+        if (!icl || !icl->priv)
                 return -EINVAL;
 
-        info = container_of(icl, struct tw9910_video_info, link);
+        info = icl->priv;
 
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
                 dev_err(&client->dev,
@@ -976,7 +976,7 @@ static int tw9910_probe(struct i2c_client *client,
         v4l2_i2c_subdev_init(&priv->subdev, client, &tw9910_subdev_ops);
 
         icd->ops     = &tw9910_ops;
-        icd->iface   = info->link.bus_id;
+        icd->iface   = icl->bus_id;
 
         ret = tw9910_video_probe(icd, client);
         if (ret) {