From a7c144e704b2c8497318bbd3470936ef67caffc3 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Fri, 2 Apr 2010 08:31:50 -0300
Subject: [PATCH] --- yaml --- r: 192987 b: refs/heads/master c:
 a41b2ea73ad81bb42364841b37d4c3830a53dc0d h: refs/heads/master i:   192985:
 842f42204ead22316b1ebd53def288cc9d068618   192983:
 b67f1b744f8f35b7156b0d1058afa46911c054c6 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/media/video/cx88/cx88-video.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bc8b52c988ea..09ef999564ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e47567f7d24346980f109d7eaed083106ff170d
+refs/heads/master: a41b2ea73ad81bb42364841b37d4c3830a53dc0d
diff --git a/trunk/drivers/media/video/cx88/cx88-video.c b/trunk/drivers/media/video/cx88/cx88-video.c
index f5d1d89bdc26..0fab65c3ab39 100644
--- a/trunk/drivers/media/video/cx88/cx88-video.c
+++ b/trunk/drivers/media/video/cx88/cx88-video.c
@@ -1538,9 +1538,12 @@ static int radio_queryctrl (struct file *file, void *priv,
 		c->id >= V4L2_CID_LASTP1)
 		return -EINVAL;
 	if (c->id == V4L2_CID_AUDIO_MUTE) {
-		for (i = 0; i < CX8800_CTLS; i++)
+		for (i = 0; i < CX8800_CTLS; i++) {
 			if (cx8800_ctls[i].v.id == c->id)
 				break;
+		}
+		if (i == CX8800_CTLS)
+			return -EINVAL;
 		*c = cx8800_ctls[i].v;
 	} else
 		*c = no_ctl;