diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-02-25 11:13:08 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2007-02-25 11:13:08 +0100 |
| commit | 0ef39045d22cd86b1faf31910298a61ad9e9e4b7 (patch) | |
| tree | 9aca32ee5c3851b02f94236aa95a4de24f4df3d8 /linux/drivers | |
| parent | 3456dcb8bdd105f85c8f1a177d03051f698da268 (diff) | |
| download | mediapointer-dvb-s2-0ef39045d22cd86b1faf31910298a61ad9e9e4b7.tar.gz mediapointer-dvb-s2-0ef39045d22cd86b1faf31910298a61ad9e9e4b7.tar.bz2 | |
Remove V4L2_CHIP_MATCH_ALWAYS.
From: Hans Verkuil <hverkuil@xs4all.nl>
V4L2_CHIP_MATCH_ALWAYS turned out to be confusing and also unnecessary.
It's now removed.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/cafe_ccic.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/v4l2-common.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/linux/drivers/media/video/cafe_ccic.c b/linux/drivers/media/video/cafe_ccic.c index 5f35836ad..b96d45654 100644 --- a/linux/drivers/media/video/cafe_ccic.c +++ b/linux/drivers/media/video/cafe_ccic.c @@ -826,7 +826,7 @@ static int __cafe_cam_reset(struct cafe_camera *cam) */ static int cafe_cam_init(struct cafe_camera *cam) { - struct v4l2_chip_ident chip = { V4L2_CHIP_MATCH_ALWAYS }; + struct v4l2_chip_ident chip = { V4L2_CHIP_MATCH_I2C_ADDR, 0, 0, 0 }; int ret; mutex_lock(&cam->s_mutex); @@ -836,6 +836,7 @@ static int cafe_cam_init(struct cafe_camera *cam) ret = __cafe_cam_reset(cam); if (ret) goto out; + chip.match_chip = cam->sensor->addr; ret = __cafe_cam_cmd(cam, VIDIOC_G_CHIP_IDENT, &chip); if (ret) goto out; diff --git a/linux/drivers/media/video/v4l2-common.c b/linux/drivers/media/video/v4l2-common.c index b2d57d888..60c56a8b0 100644 --- a/linux/drivers/media/video/v4l2-common.c +++ b/linux/drivers/media/video/v4l2-common.c @@ -1596,8 +1596,6 @@ u32 v4l2_ctrl_next(const u32 * const * ctrl_classes, u32 id) int v4l2_chip_match_i2c_client(struct i2c_client *c, u32 match_type, u32 match_chip) { switch (match_type) { - case V4L2_CHIP_MATCH_ALWAYS: - return 1; case V4L2_CHIP_MATCH_I2C_DRIVER: return (c != NULL && c->driver != NULL && c->driver->id == match_chip); case V4L2_CHIP_MATCH_I2C_ADDR: @@ -1610,8 +1608,6 @@ int v4l2_chip_match_i2c_client(struct i2c_client *c, u32 match_type, u32 match_c int v4l2_chip_match_host(u32 match_type, u32 match_chip) { switch (match_type) { - case V4L2_CHIP_MATCH_ALWAYS: - return 1; case V4L2_CHIP_MATCH_HOST: return match_chip == 0; default: |