From: "Fernando Luis Vázquez Cao" <fernando_b1@lab.ntt.co.jp>
To: Jiri Kosina <jkosina@suse.cz>
Cc: linux-input@vger.kernel.org, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org,
Antonio Ospite <ospite@studenti.unina.it>
Subject: [PATCH] HID: fix botched tree merge that disabled fix-up for certain Sony RF receivers
Date: Wed, 01 May 2013 09:26:23 +0900 [thread overview]
Message-ID: <1367367983.4712.5.camel@nexus> (raw)
In-Reply-To: <1367367906.4712.4.camel@nexus>
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: stable@vger.kernel.org
Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
---
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) },
next prev parent reply other threads:[~2013-05-01 0:26 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-15 3:43 [PATCH] HID: add support for Sony RF receiver with USB product id 0x0374 Fernando Luis Vázquez Cao
2013-01-15 9:36 ` Antonio Ospite
2013-01-15 10:03 ` Fernando Luis Vazquez Cao
2013-01-15 10:40 ` [PATCH v2] " Fernando Luis Vázquez Cao
2013-01-15 16:02 ` Jiri Kosina
2013-01-16 5:17 ` Fernando Luis Vazquez Cao
2013-01-16 10:44 ` Jiri Kosina
2013-01-22 5:57 ` Fernando Luis Vazquez Cao
2013-01-22 6:20 ` HID: clean up quirk for Sony RF receivers Fernando Luis Vázquez Cao
2013-01-22 10:08 ` Jiri Kosina
2013-01-22 10:04 ` [PATCH v2] HID: add support for Sony RF receiver with USB product id 0x0374 Jiri Kosina
2013-05-01 0:25 ` Fernando Luis Vázquez Cao
2013-05-01 0:26 ` Fernando Luis Vázquez Cao [this message]
2013-05-01 12:59 ` [PATCH] HID: fix botched tree merge that disabled fix-up for certain Sony RF receivers Jiri Kosina
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1367367983.4712.5.camel@nexus \
--to=fernando_b1@lab.ntt.co.jp \
--cc=jkosina@suse.cz \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=ospite@studenti.unina.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox