diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-17 10:11:30 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-17 10:11:30 -0300 |
| commit | c7d66a73b2ab88ce7c12d867e2830ee221e58489 (patch) | |
| tree | 999aadcd0060a35df5736526121faa248b7f90e5 /linux/drivers/media/video/v4l1-compat.c | |
| parent | 7c561c60c12a727840a1b24c5e2c9b47d0864944 (diff) | |
| parent | 47a1368908d1a5cd3548d44cfa19853c26ddfeaf (diff) | |
| download | mediapointer-dvb-s2-c7d66a73b2ab88ce7c12d867e2830ee221e58489.tar.gz mediapointer-dvb-s2-c7d66a73b2ab88ce7c12d867e2830ee221e58489.tar.bz2 | |
merge: http://linuxtv.org/hg/~anttip/reddo-dvb-c/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/v4l1-compat.c')
| -rw-r--r-- | linux/drivers/media/video/v4l1-compat.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/linux/drivers/media/video/v4l1-compat.c b/linux/drivers/media/video/v4l1-compat.c index 2225243ad..12e295750 100644 --- a/linux/drivers/media/video/v4l1-compat.c +++ b/linux/drivers/media/video/v4l1-compat.c @@ -565,10 +565,9 @@ static noinline long v4l1_compat_get_input_info( break; } chan->norm = 0; - err = drv(file, VIDIOC_G_STD, &sid); - if (err < 0) - dprintk("VIDIOCGCHAN / VIDIOC_G_STD: %ld\n", err); - if (err == 0) { + /* Note: G_STD might not be present for radio receivers, + * so we should ignore any errors. */ + if (drv(file, VIDIOC_G_STD, &sid) == 0) { if (sid & V4L2_STD_PAL) chan->norm = VIDEO_MODE_PAL; if (sid & V4L2_STD_NTSC) @@ -777,10 +776,9 @@ static noinline long v4l1_compat_get_tuner( tun->flags |= VIDEO_TUNER_SECAM; } - err = drv(file, VIDIOC_G_STD, &sid); - if (err < 0) - dprintk("VIDIOCGTUNER / VIDIOC_G_STD: %ld\n", err); - if (err == 0) { + /* Note: G_STD might not be present for radio receivers, + * so we should ignore any errors. */ + if (drv(file, VIDIOC_G_STD, &sid) == 0) { if (sid & V4L2_STD_PAL) tun->mode = VIDEO_MODE_PAL; if (sid & V4L2_STD_NTSC) |