Subject: Re: [PATCH v2] HID: add support for Sony RF receiver with USB product id 0x0374

Hi Jiri,

On Tue, 2013-01-15 at 17:02 +0100, Jiri Kosina wrote:
> On Tue, 15 Jan 2013, Fernando Luis Vázquez Cao wrote:
>
> > Some Vaio desktop computers, among them the VGC-LN51JGB multimedia PC, have
> > a RF receiver, multi-interface USB device 054c:0374, that is used to connect
> > a wireless keyboard and a wireless mouse.
> >
> > The keyboard works flawlessly, but the mouse (VGP-WMS3 in my case) does not
> > seem to be generating any pointer events. The problem is that the mouse pointer
> > is wrongly declared as a constant non-data variable in the report descriptor
> > (see lsusb and usbhid-dump output below), with the consequence that it is
> > ignored by the HID code.
> >
> > Add this device to the have-special-driver list and fix up the report
> > descriptor in the Sony-specific driver which happens to already have a fixup
> > for a similar firmware bug.
>
> Applied, thanks.

It looks like after the merge of the the sony and steelseries
branches the hid core hunk was left out, which means that
this fix-up is never applied.

I will be replying to this email with a fix.

Thanks,
Fernando


Subject: [PATCH] HID: fix botched tree merge that disabled fix-up for certain Sony RF receivers

It looks like the manual merge 0d69a3c731e120b05b7da9fb976830475a3fbc01 ("Merge
branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linus") accidentally
removed Sony RF receiver with USB product id 0x0374 from the "have special
driver" list, effectively nullifying a464918419f94a0043d2f549d6defb4c3f69f68a
("HID: add support for Sony RF receiver with USB product id 0x0374"). Add the
device back to the list.

Cc: [email protected]
Signed-off-by: Fernando Luis Vazquez Cao <[email protected]>
---

diff -urNp linux-3.9/drivers/hid/hid-core.c linux-3.9-fix/drivers/hid/hid-core.c
--- linux-3.9/drivers/hid/hid-core.c 2013-04-29 09:36:01.000000000 +0900
+++ linux-3.9-fix/drivers/hid/hid-core.c 2013-04-30 21:53:57.596269692 +0900
@@ -1702,6 +1702,7 @@ static const struct hid_device_id hid_ha
{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER) },
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE) },
{ HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_SRWS1) },
{ HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
{ HID_USB_DEVICE(USB_VENDOR_ID_THINGM, USB_DEVICE_ID_BLINK1) },

2013-05-01 12:59:35

by Jiri Kosina

[permalink] [raw]
Subject: Re: [PATCH] HID: fix botched tree merge that disabled fix-up for certain Sony RF receivers

On Wed, 1 May 2013, Fernando Luis Vázquez Cao wrote:

> It looks like the manual merge 0d69a3c731e120b05b7da9fb976830475a3fbc01 ("Merge
> branches 'for-3.9/sony' and 'for-3.9/steelseries' into for-linus") accidentally
> removed Sony RF receiver with USB product id 0x0374 from the "have special
> driver" list, effectively nullifying a464918419f94a0043d2f549d6defb4c3f69f68a
> ("HID: add support for Sony RF receiver with USB product id 0x0374"). Add the
> device back to the list.
>
> Cc: [email protected]
> Signed-off-by: Fernando Luis Vazquez Cao <[email protected]>
> ---
>
> diff -urNp linux-3.9/drivers/hid/hid-core.c linux-3.9-fix/drivers/hid/hid-core.c
> --- linux-3.9/drivers/hid/hid-core.c 2013-04-29 09:36:01.000000000 +0900
> +++ linux-3.9-fix/drivers/hid/hid-core.c 2013-04-30 21:53:57.596269692 +0900
> @@ -1702,6 +1702,7 @@ static const struct hid_device_id hid_ha
> { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER) },
> { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
> { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
> + { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE) },
> { HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_SRWS1) },
> { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
> { HID_USB_DEVICE(USB_VENDOR_ID_THINGM, USB_DEVICE_ID_BLINK1) },

Thanks a lot for noticing. Applied.

--
Jiri Kosina
SUSE Labs