diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-29 11:12:27 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-29 11:12:27 +0000 |
| commit | 1e76fd570a040e49cab39af526d399c79d44ad01 (patch) | |
| tree | bd31b9654beeff5d1537b88bbf1861194ab6fce4 | |
| parent | 79e38b2e91236313fe56aa090ed33a0719763e97 (diff) | |
| download | mediapointer-dvb-s2-1e76fd570a040e49cab39af526d399c79d44ad01.tar.gz mediapointer-dvb-s2-1e76fd570a040e49cab39af526d399c79d44ad01.tar.bz2 | |
Fix buglets in v4l1 compatibility layer
From: Russell King <rmk@arm.linux.org.uk>
The following patch fixes a few bugs I've noticed in the V4L1
compatibility layer:
- VIDEO_MODE_AUTO for get/set input ioctls was not being handled
- wrong V4L2 ioctl being used in v4l1_compat_select_tuner
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | linux/drivers/media/video/v4l1-compat.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/linux/drivers/media/video/v4l1-compat.c b/linux/drivers/media/video/v4l1-compat.c index 4a4cb4c57..ee3991f2f 100644 --- a/linux/drivers/media/video/v4l1-compat.c +++ b/linux/drivers/media/video/v4l1-compat.c @@ -576,6 +576,8 @@ static noinline long v4l1_compat_get_input_info( chan->norm = VIDEO_MODE_NTSC; if (sid & V4L2_STD_SECAM) chan->norm = VIDEO_MODE_SECAM; + if (sid == V4L2_STD_ALL) + chan->norm = VIDEO_MODE_AUTO; } done: return err; @@ -602,6 +604,9 @@ static noinline long v4l1_compat_set_input( case VIDEO_MODE_SECAM: sid = V4L2_STD_SECAM; break; + case VIDEO_MODE_AUTO: + sid = V4L2_STD_ALL; + break; } if (0 != sid) { err = drv(file, VIDIOC_S_STD, &sid); @@ -805,9 +810,9 @@ static noinline long v4l1_compat_select_tuner( t.index = tun->tuner; - err = drv(file, VIDIOC_S_INPUT, &t); + err = drv(file, VIDIOC_S_TUNER, &t); if (err < 0) - dprintk("VIDIOCSTUNER / VIDIOC_S_INPUT: %ld\n", err); + dprintk("VIDIOCSTUNER / VIDIOC_S_TUNER: %ld\n", err); return err; } |