From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail01d.mail.t-online.hu ([84.2.42.6]:53645 "EHLO mail01d.mail.t-online.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751041Ab0A2RDM (ORCPT ); Fri, 29 Jan 2010 12:03:12 -0500 Message-ID: <4B6314C6.80503@freemail.hu> Date: Fri, 29 Jan 2010 18:03:02 +0100 From: =?UTF-8?B?TsOpbWV0aCBNw6FydG9u?= MIME-Version: 1.0 To: Mauro Carvalho Chehab CC: Laurent Pinchart , V4L Mailing List Subject: Re: [PATCH] uvcvideo: check minimum border of control References: <4B5F60B0.7090709@freemail.hu> <4B63083C.5020909@redhat.com> In-Reply-To: <4B63083C.5020909@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org List-ID: Mauro Carvalho Chehab wrote: > Németh Márton wrote: >> Check also the minimum border of a value before setting it >> to a control value. >> >> See also http://bugzilla.kernel.org/show_bug.cgi?id=12824 . > > Patch didn't apply. Had you generated against our -git tree? > http://git.linuxtv.org/v4l-dvb.git No, this is against http://git.linuxtv.org/pinchartl/uvcvideo.git . The latest patch which tried to fix http://bugzilla.kernel.org/show_bug.cgi?id=12824 missed to check the minimum border. Regards, Márton Németh >> Signed-off-by: Márton Németh >> --- >> drivers/media/video/uvc/uvc_ctrl.c | 2 ++ >> 1 files changed, 2 insertions(+), 0 deletions(-) >> >> diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c >> --- a/drivers/media/video/uvc/uvc_ctrl.c >> +++ b/drivers/media/video/uvc/uvc_ctrl.c >> @@ -1068,6 +1068,8 @@ int uvc_ctrl_set(struct uvc_video_chain *chain, >> uvc_ctrl_data(ctrl, UVC_CTRL_DATA_RES)); >> >> xctrl->value = min + (xctrl->value - min + step/2) / step * step; >> + if (xctrl->value < min) >> + xctrl->value = min; >> if (xctrl->value > max) >> xctrl->value = max; >> value = xctrl->value;