Re: macbook webcam no longer works on .35-rc

[Laurent Pinchart <laurent.pinchart@ideasonboard.com>]

Hi Johannes,

On Monday 05 July 2010 10:15:53 Johannes Berg wrote:
> On Mon, 2010-07-05 at 09:28 +0200, Laurent Pinchart wrote:
> > Hi Johannes,
> > 
> > On Friday 02 July 2010 09:26:15 Johannes Berg wrote:
> > > On Wed, 2010-06-30 at 23:11 +0200, Johannes Berg wrote:
> > > > I'm pretty sure this was a regression in .34, but haven't checked
> > > > right now, can bisect when I find time but wanted to inquire first
> > > > if somebody had ideas. All I get is:
> > > > 
> > > > [57372.078968] uvcvideo: Failed to query (130) UVC control 5 (unit 3)
> > > > : -32 (exp. 1).
> > 
> > Does it prevent your camera from working, or does it "just" print
> > annoying messages to the kernel log ?
> 
> It prevents it from working, and it's the only error message since the
> tool/driver/libv4l/whatever just gives up after getting -EIO.
> 
> lsusb -v is:

[snip]

Thanks.

> PS: I'll be on vacation until Saturday starting right now.

Could you please test the following patch when you will have time ?

diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c
index 9af4d47..a350fad 100644
--- a/drivers/media/video/uvc/uvc_ctrl.c
+++ b/drivers/media/video/uvc/uvc_ctrl.c
@@ -122,8 +122,8 @@ static struct uvc_control_info uvc_ctrls[] = {
 		.selector	= UVC_PU_POWER_LINE_FREQUENCY_CONTROL,
 		.index		= 10,
 		.size		= 1,
-		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_RANGE
-				| UVC_CONTROL_RESTORE,
+		.flags		= UVC_CONTROL_SET_CUR | UVC_CONTROL_GET_CUR
+				| UVC_CONTROL_GET_DEF | UVC_CONTROL_RESTORE,
 	},
 	{
 		.entity		= UVC_GUID_UVC_PROCESSING,


-- 
Regards,

Laurent Pinchart