cx231xx: improve error handling

PATCH In review [email protected] 1 participant 1 message Apr 27, 2010 Media (V4L/DVB)

lore

Share & tools

lore

[email protected]

author

2010-04-27 21:23 UTC #0 lore raw

PATCH 11/11 cx231xx: improve error handling

From: Dan Carpenter <[email protected]>

Return -EINVAL if we don't find the control id.

Signed-off-by Dan Carpenter <[email protected]>

Cc Mauro Carvalho Chehab <[email protected]>

Cc Laurent Pinchart <[email protected]>

Cc Trent Piepho <[email protected]>

Cc Douglas Schilling Landgraf <[email protected]>

Signed-off-by Andrew Morton <[email protected]>

---

 drivers/media/video/cx231xx/cx231xx-video.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

drivers/media/video/cx231xx/cx231xx-video.c renamed from drivers/media/video/cx231xx/cx231xx-video.c~cx231xx-improve-error-handling +4 -1

diff -puN drivers/media/video/cx231xx/cx231xx-video.c~cx231xx-improve-error-handling drivers/media/video/cx231xx/cx231xx-video.c
@@ -1902,9 +1902,12 @@ static int radio_queryctrl(struct file *
 	if (c->id < V4L2_CID_BASE || c->id >= V4L2_CID_LASTP1)
 		return -EINVAL;
 	if (c->id == V4L2_CID_AUDIO_MUTE) {
-		for (i = 0; i < CX231XX_CTLS; i++)
+		for (i = 0; i < CX231XX_CTLS; i++) {
 			if (cx231xx_ctls[i].v.id == c->id)
 				break;
+		}
+		if (i == CX231XX_CTLS)
+			return -EINVAL;
 		*c = cx231xx_ctls[i].v;
 	} else
 		*c = no_ctl;