diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-01-21 21:06:42 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 17:42:26 +0200 |
| commit | 07f7db4ce7b29d431553b426e0dcb720c5297a4b (patch) | |
| tree | 3fe2ce0195cd5e840268e30f4dda6c21265649b4 /drivers/media/video | |
| parent | V4L/DVB (10286): af9015: add new USB ID for KWorld DVB-T 395U (diff) | |
| download | linux-07f7db4ce7b29d431553b426e0dcb720c5297a4b.tar.xz linux-07f7db4ce7b29d431553b426e0dcb720c5297a4b.zip | |
V4L/DVB (10291): em28xx: fix VIDIOC_G_CTRL when there is no msp34xx device.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-video.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index 8e61b2ca9167..d8b45b5ee041 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c @@ -1008,8 +1008,13 @@ static int vidioc_g_ctrl(struct file *file, void *priv, if (dev->board.has_msp34xx) em28xx_i2c_call_clients(dev, VIDIOC_G_CTRL, ctrl); - else + else { rc = em28xx_get_ctrl(dev, ctrl); + if (rc < 0) { + em28xx_i2c_call_clients(dev, VIDIOC_G_CTRL, ctrl); + rc = 0; + } + } mutex_unlock(&dev->lock); return rc; |