V4L/DVB (12948): v4l1-compat: fix VIDIOC_G_STD handling

commit 707ca1e30f087f9a6d144693dafc4b67880678c2 upstream.

The VIDIOC_G_STD ioctl may not be present in the case of radio receivers.
In that case G_STD will return an error. The v4l1-compat layer should not
attempt to propagate that error to the caller, instead it should be
ignored.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c
index 02f2a6d18b4582987e1ce0ade96ba510738093ff..ec766937aff64866b7068bf26435af2348e98ae2 100644 (file)
--- a/drivers/media/video/v4l1-compat.c
+++ b/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)