diff options
Diffstat (limited to 'drivers/media/video/cafe_ccic.c')
-rw-r--r-- | drivers/media/video/cafe_ccic.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c index 476171cf5001..34a39d2e4703 100644 --- a/drivers/media/video/cafe_ccic.c +++ b/drivers/media/video/cafe_ccic.c | |||
@@ -859,7 +859,7 @@ static int __cafe_cam_reset(struct cafe_camera *cam) | |||
859 | */ | 859 | */ |
860 | static int cafe_cam_init(struct cafe_camera *cam) | 860 | static int cafe_cam_init(struct cafe_camera *cam) |
861 | { | 861 | { |
862 | struct v4l2_chip_ident chip = { V4L2_CHIP_MATCH_I2C_ADDR, 0, 0, 0 }; | 862 | struct v4l2_dbg_chip_ident chip; |
863 | int ret; | 863 | int ret; |
864 | 864 | ||
865 | mutex_lock(&cam->s_mutex); | 865 | mutex_lock(&cam->s_mutex); |
@@ -869,8 +869,9 @@ static int cafe_cam_init(struct cafe_camera *cam) | |||
869 | ret = __cafe_cam_reset(cam); | 869 | ret = __cafe_cam_reset(cam); |
870 | if (ret) | 870 | if (ret) |
871 | goto out; | 871 | goto out; |
872 | chip.match_chip = cam->sensor->addr; | 872 | chip.match.type = V4L2_CHIP_MATCH_I2C_ADDR; |
873 | ret = __cafe_cam_cmd(cam, VIDIOC_G_CHIP_IDENT, &chip); | 873 | chip.match.addr = cam->sensor->addr; |
874 | ret = __cafe_cam_cmd(cam, VIDIOC_DBG_G_CHIP_IDENT, &chip); | ||
874 | if (ret) | 875 | if (ret) |
875 | goto out; | 876 | goto out; |
876 | cam->sensor_type = chip.ident; | 877 | cam->sensor_type = chip.ident; |