[PATCH] uvcvideo: check minimum border of control

[PATCH] uvcvideo: check minimum border of control

[Németh Márton]

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 .

Signed-off-by: Márton Németh <nm127@freemail.hu>
---
 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;

Re: [PATCH] uvcvideo: check minimum border of control

[Mauro Carvalho Chehab]

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

Cheers,
Mauro.

> 
> Signed-off-by: Márton Németh <nm127@freemail.hu>
> ---
>  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;
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] uvcvideo: check minimum border of control

[Németh Márton]

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 <nm127@freemail.hu>
>> ---
>>  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;

Re: [PATCH] uvcvideo: check minimum border of control

[Mauro Carvalho Chehab]

Németh Márton wrote:
> 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.

Ah, ok. Please specify on the subject when you're writing patches against
a different tree. This helps me to tag accordingly at Patchwork, 
saving me some time.
> 
> Regards,
> 
> 	Márton Németh
> 
>>> Signed-off-by: Márton Németh <nm127@freemail.hu>

Re: [PATCH] uvcvideo: check minimum border of control

[Németh Márton]

Mauro Carvalho Chehab wrote:
> Németh Márton wrote:
>> 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.
> 
> Ah, ok. Please specify on the subject when you're writing patches against
> a different tree. This helps me to tag accordingly at Patchwork, 

Could you please give me an example what do you mean? For example in
this case.

Regards,

	Márton Németh

Re: [PATCH] uvcvideo: check minimum border of control

[Mauro Carvalho Chehab]

Németh Márton wrote:
> Mauro Carvalho Chehab wrote:
>> Németh Márton wrote:
>>> 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.
>> Ah, ok. Please specify on the subject when you're writing patches against
>> a different tree. This helps me to tag accordingly at Patchwork, 
> 
> Could you please give me an example what do you mean? For example in
> this case.

You could for example, use at the subject:

[PATCH uvc tree] <patch description>

This helps me to not assume that it is against the upstream tree.

-- 

Cheers,
Mauro

Re: [PATCH] uvcvideo: check minimum border of control

[Laurent Pinchart]

Hi Márton,


On Tuesday 26 January 2010 22:37:52 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 .
> 
> Signed-off-by: Márton Németh <nm127@freemail.hu>

I've updated the previous patch in the uvcvideo git repository, could you 
please test it ? 

-- 
Regards,

Laurent Pinchart