Re: [PATCH] HID:magicmouse: This fixes a connection problem with the magicmouse.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, 12 May 2010, Justin P. Mattock wrote:

> > > --- a/drivers/hid/hid-magicmouse.c
> > > +++ b/drivers/hid/hid-magicmouse.c
> > > @@ -354,7 +354,7 @@ static int magicmouse_probe(struct hid_device *hdev,
> > >   		goto err_free;
> > >   	}
> > > 
> > > -	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT&  ~HID_CONNECT_HIDINPUT);
> > > +	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
> > >      
> > This is not particularly right, as we'll end up having dangling input
> > device.
> > 
> > The problem is, that when HIDRAW is not set, hid_hw_start() returns ENODEV
> > as no subsystem has claimed the device, and probe routine bails out. Which
> > is not what we want.
> > 
> > Does the testing patch below fix the problems you are seeing?
> > 
> > 
> >    
> works good.. rebooted a few times mouse connects. suspended a few times 
> mouse reconnects.

I'd be glad if you could also double-check that device removal and 
re-connecting it works well as well with this patch.

> > diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
> > index 0d471fc..f10d56a 100644
> > --- a/drivers/hid/hid-magicmouse.c
> > +++ b/drivers/hid/hid-magicmouse.c
> > @@ -354,12 +354,15 @@ static int magicmouse_probe(struct hid_device *hdev,
> >   		goto err_free;
> >   	}
> > 
> > -	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT&  ~HID_CONNECT_HIDINPUT);
> > +	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
> >   	if (ret) {
> >   		dev_err(&hdev->dev, "magicmouse hw start failed\n");
> >   		goto err_free;
> >   	}
> > 
> > +	/* we are handling the input ourselves */
> > +	hidinput_disconnect(hdev);
> > +
> >   	report = hid_register_report(hdev, HID_INPUT_REPORT, TOUCH_REPORT_ID);
> >   	if (!report) {
> >   		dev_err(&hdev->dev, "unable to register touch report\n");
> > 
> >    
> 
> looks good over here.. If you'd like I can re-du this patch, add your 
> sign off etc.. and re-send, or not worry.. either way this little 
> quirk/problem is fixed.

No problem, once you confirm that device removal wasn't broken again and 
if I don't hear any objections from Michael, I will queue the patch 
myself.

Thanks,

-- 
Jiri Kosina
SUSE Labs, Novell Inc.
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux