From patchwork Tue Apr 27 21:11:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 3259 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Tue, 27 Apr 2010 21:23:34 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra with IMAP (fetchmail-6.3.6) for (single-drop); Tue, 27 Apr 2010 18:27:43 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1O6sFi-0007m0-7v; Tue, 27 Apr 2010 21:23:34 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757014Ab0D0VXc (ORCPT + 1 other); Tue, 27 Apr 2010 17:23:32 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:60840 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757005Ab0D0VXb (ORCPT ); Tue, 27 Apr 2010 17:23:31 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id o3RLHc0V021542 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 27 Apr 2010 14:22:58 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id o3RLBSEX020011; Tue, 27 Apr 2010 14:11:28 -0700 Message-Id: <201004272111.o3RLBSEX020011@imap1.linux-foundation.org> Subject: [patch 11/11] cx231xx: improve error handling To: mchehab@infradead.org Cc: linux-media@vger.kernel.org, akpm@linux-foundation.org, error27@gmail.com, dougsland@redhat.com, laurent.pinchart@ideasonboard.com, xyzzy@speakeasy.org From: akpm@linux-foundation.org Date: Tue, 27 Apr 2010 14:11:27 -0700 MIME-Version: 1.0 X-Spam-Status: No, hits=-3.504 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Dan Carpenter Return -EINVAL if we don't find the control id. Signed-off-by: Dan Carpenter Cc: Mauro Carvalho Chehab Cc: Laurent Pinchart Cc: Trent Piepho Cc: Douglas Schilling Landgraf Signed-off-by: Andrew Morton --- drivers/media/video/cx231xx/cx231xx-video.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff -puN drivers/media/video/cx231xx/cx231xx-video.c~cx231xx-improve-error-handling drivers/media/video/cx231xx/cx231xx-video.c --- a/drivers/media/video/cx231xx/cx231xx-video.c~cx231xx-improve-error-handling +++ a/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;