diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-25 10:09:33 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-25 10:09:33 -0200 |
| commit | dc6e8817d776cdb670fd1db1cb48f2ee25c91717 (patch) | |
| tree | 677d3c5ec66470c67ef759f05bc10651b19be25e /linux/drivers | |
| parent | 72fadf90dd75161b532265142351354510a62e3c (diff) | |
| parent | 29dc3ffaee320cff68d0ef8a2d9e2e0f112df29d (diff) | |
| download | mediapointer-dvb-s2-dc6e8817d776cdb670fd1db1cb48f2ee25c91717.tar.gz mediapointer-dvb-s2-dc6e8817d776cdb670fd1db1cb48f2ee25c91717.tar.bz2 | |
merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
There's something weird with mercurial... sometimes, hg merge doesn't
work. Instead, I need to do:
hg update
hg merge -r <the other head>
hg commit
This way, the diff patch will show what happened with the first head,
instead of the merging changes added by the newer one :(
Anyway, since each individual patch can be seem at the history, it will
work.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
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: |