aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-04-02 07:31:50 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 11:57:31 -0400
commita41b2ea73ad81bb42364841b37d4c3830a53dc0d (patch)
tree65cc30386bcc1dcf4faacdd7b0078f6574012312 /drivers/media/video/cx88
parent8e47567f7d24346980f109d7eaed083106ff170d (diff)
V4L/DVB: cx88: improve error handling
Return -EINVAL if we don't find the right query control id. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx88')
-rw-r--r--drivers/media/video/cx88/cx88-video.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index f5d1d89bdc26..0fab65c3ab39 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -1538,9 +1538,12 @@ static int radio_queryctrl (struct file *file, void *priv,
1538 c->id >= V4L2_CID_LASTP1) 1538 c->id >= V4L2_CID_LASTP1)
1539 return -EINVAL; 1539 return -EINVAL;
1540 if (c->id == V4L2_CID_AUDIO_MUTE) { 1540 if (c->id == V4L2_CID_AUDIO_MUTE) {
1541 for (i = 0; i < CX8800_CTLS; i++) 1541 for (i = 0; i < CX8800_CTLS; i++) {
1542 if (cx8800_ctls[i].v.id == c->id) 1542 if (cx8800_ctls[i].v.id == c->id)
1543 break; 1543 break;
1544 }
1545 if (i == CX8800_CTLS)
1546 return -EINVAL;
1544 *c = cx8800_ctls[i].v; 1547 *c = cx8800_ctls[i].v;
1545 } else 1548 } else
1546 *c = no_ctl; 1549 *c = no_ctl;