[patch 26/26] V4L: cx88-blackbird: fix vidioc_g_tuner never ending list of tuners

Greg KH
2007-07-31T04:40:49Z

[-- Attachment #1: v4l-cx88-blackbird-fix-vidioc_g_tuner-never-ending-list-of-tuners.patch --]
[-- Type: text/plain, Size: 1268 bytes --]

-stable review patch. If anyone has any objections, please let us know.

------------------

From: Jelle Foks <jelle@foks.8m.com>

v4l-info and other programs would loop indefinitely while querying the
tuners for cx88-blackbird cards.

The cause was that vidioc_g_tuner didn't return an error value for
qctrl->id != 0, making the application think there is a never ending
list of tuners...

This patch adds the same index check as done in vidioc_g_tuner() in
cx88-video.

Signed-off-by: Jelle Foks <jelle@foks.8m.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
(cherry picked from commit f057131fb6eb2c45f6023e3da41ccd6e4e71aee9)

drivers/media/video/cx88/cx88-blackbird.c | 2 ++
1 file changed, 2 insertions(+)

--- linux-2.6.21.6.orig/drivers/media/video/cx88/cx88-blackbird.c
+++ linux-2.6.21.6/drivers/media/video/cx88/cx88-blackbird.c
@@ -1034,6 +1034,8 @@ static int vidioc_g_tuner (struct file *

if (unlikely(UNSET == core->tuner_type))
return -EINVAL;
+ if (0 != t->index)
+ return -EINVAL;

strcpy(t->name, "Television");
t->type = V4L2_TUNER_ANALOG_TV;

--