From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [merged] drivers-media-video-et61x251-et61x251_corec-improve-error-handling.patch removed from -mm tree Date: Tue, 04 May 2010 11:28:20 -0400 Message-ID: <201005041829.o44ITpN2011408@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:40983 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932661Ab0EDSad (ORCPT ); Tue, 4 May 2010 14:30:33 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: error27@gmail.com, laurent.pinchart@ideasonboard.com, luca.risolia@studio.unibo.it, mchehab@infradead.org, mm-commits@vger.kernel.org The patch titled drivers/media/video/et61x251/et61x251_core.c: improve error handling has been removed from the -mm tree. Its filename was drivers-media-video-et61x251-et61x251_corec-improve-error-handling.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: drivers/media/video/et61x251/et61x251_core.c: improve error handling From: Dan Carpenter The original code doesn't handle the situation where the controller is not found. Signed-off-by: Dan Carpenter Cc: Luca Risolia Cc: Mauro Carvalho Chehab Cc: Laurent Pinchart Signed-off-by: Andrew Morton --- drivers/media/video/et61x251/et61x251_core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff -puN drivers/media/video/et61x251/et61x251_core.c~drivers-media-video-et61x251-et61x251_corec-improve-error-handling drivers/media/video/et61x251/et61x251_core.c --- a/drivers/media/video/et61x251/et61x251_core.c~drivers-media-video-et61x251-et61x251_corec-improve-error-handling +++ a/drivers/media/video/et61x251/et61x251_core.c @@ -1713,7 +1713,7 @@ et61x251_vidioc_s_ctrl(struct et61x251_d if (copy_from_user(&ctrl, arg, sizeof(ctrl))) return -EFAULT; - for (i = 0; i < ARRAY_SIZE(s->qctrl); i++) + for (i = 0; i < ARRAY_SIZE(s->qctrl); i++) { if (ctrl.id == s->qctrl[i].id) { if (s->qctrl[i].flags & V4L2_CTRL_FLAG_DISABLED) return -EINVAL; @@ -1723,7 +1723,9 @@ et61x251_vidioc_s_ctrl(struct et61x251_d ctrl.value -= ctrl.value % s->qctrl[i].step; break; }