From: Jelle Foks Date: Mon, 21 May 2007 17:56:17 +0000 (-0300) Subject: V4L/DVB (5816): Cx88-blackbird: fix vidioc_g_tuner never ending list of tuners X-Git-Tag: v2.6.22~34^2~2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f057131fb6eb2c45f6023e3da41ccd6e4e71aee9;p=linux-2.6-omap-h63xx.git V4L/DVB (5816): Cx88-blackbird: fix vidioc_g_tuner never ending list of tuners 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 Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c index b0466b88f52..a80b1cb1abe 100644 --- a/drivers/media/video/cx88/cx88-blackbird.c +++ b/drivers/media/video/cx88/cx88-blackbird.c @@ -1034,6 +1034,8 @@ static int vidioc_g_tuner (struct file *file, void *priv, if (unlikely(UNSET == core->tuner_type)) return -EINVAL; + if (0 != t->index) + return -EINVAL; strcpy(t->name, "Television"); t->type = V4L2_TUNER_ANALOG_TV;