aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/hid/hid-core.c1
-rw-r--r--drivers/hid/hid-ids.h1
-rw-r--r--drivers/hid/hid-sony.c4
3 files changed, 5 insertions, 1 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index eb2ee11b6412..1651728b5aa4 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1697,6 +1697,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
1697 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER) }, 1697 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER) },
1698 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) }, 1698 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
1699 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) }, 1699 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
1700 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE) },
1700 { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) }, 1701 { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
1701 { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) }, 1702 { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },
1702 { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) }, 1703 { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 4dfa605e2d14..50ac9097db2f 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -706,6 +706,7 @@
706 706
707#define USB_VENDOR_ID_SONY 0x054c 707#define USB_VENDOR_ID_SONY 0x054c
708#define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE 0x024b 708#define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE 0x024b
709#define USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE 0x0374
709#define USB_DEVICE_ID_SONY_PS3_BDREMOTE 0x0306 710#define USB_DEVICE_ID_SONY_PS3_BDREMOTE 0x0306
710#define USB_DEVICE_ID_SONY_PS3_CONTROLLER 0x0268 711#define USB_DEVICE_ID_SONY_PS3_CONTROLLER 0x0268
711#define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER 0x042f 712#define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER 0x042f
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 16df4d84f525..6d2d459e9a5a 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -67,7 +67,7 @@ static __u8 *sony_report_fixup(struct hid_device *hdev, __u8 *rdesc,
67 67
68 if ((sc->quirks & VAIO_RDESC_CONSTANT) && 68 if ((sc->quirks & VAIO_RDESC_CONSTANT) &&
69 *rsize >= 56 && rdesc[54] == 0x81 && rdesc[55] == 0x07) { 69 *rsize >= 56 && rdesc[54] == 0x81 && rdesc[55] == 0x07) {
70 hid_info(hdev, "Fixing up Sony Vaio VGX report descriptor\n"); 70 hid_info(hdev, "Fixing up Sony RF Receiver report descriptor\n");
71 rdesc[55] = 0x06; 71 rdesc[55] = 0x06;
72 } 72 }
73 73
@@ -245,6 +245,8 @@ static const struct hid_device_id sony_devices[] = {
245 .driver_data = SIXAXIS_CONTROLLER_BT }, 245 .driver_data = SIXAXIS_CONTROLLER_BT },
246 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE), 246 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE),
247 .driver_data = VAIO_RDESC_CONSTANT }, 247 .driver_data = VAIO_RDESC_CONSTANT },
248 { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE),
249 .driver_data = VAIO_RDESC_CONSTANT },
248 { } 250 { }
249}; 251};
250MODULE_DEVICE_TABLE(hid, sony_devices); 252MODULE_DEVICE_TABLE(hid, sony_devices);