From: Jiri Kosina <jkosina@suse.cz>
Date: Sat, 23 Oct 2010 20:47:38 +0000 (+0200)
Subject: Merge branches '3m', 'egalax', 'logitech', 'magicmouse', 'ntrig' and 'roccat' into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bbd128b5acae85b2ef346e95cc5a729ac5252f19;p=linux.git

Merge branches '3m', 'egalax', 'logitech', 'magicmouse', 'ntrig' and 'roccat' into for-linus
---

bbd128b5acae85b2ef346e95cc5a729ac5252f19
diff --cc drivers/hid/Kconfig
index 2072e0138e9fd,6369ba7f96f8c,6369ba7f96f8c,3892ff5fa11b8,6369ba7f96f8c,6369ba7f96f8c,b07440a172b5d..68a7e862068ea
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@@@@@@ -376,8 -376,8 -376,8 -384,8 -376,8 -376,8 -376,15 +384,15 @@@@@@@@ config HID_ROCCAT_KON
       	---help---
       	Support for Roccat Kone mouse.
       
++++++ config HID_ROCCAT_PYRA
++++++ 	tristate "Roccat Pyra mouse support"
++++++ 	depends on USB_HID
++++++ 	select HID_ROCCAT
++++++ 	---help---
++++++ 	Support for Roccat Pyra mouse.
++++++ 
       config HID_SAMSUNG
 ------	tristate "Samsung"
 ++++++	tristate "Samsung InfraRed remote control or keyboards"
       	depends on USB_HID
       	---help---
       	Support for Samsung InfraRed remote control or keyboards.
diff --cc drivers/hid/hid-core.c
index 5ac2be978c922,3f7292486024b,3f7292486024b,0120557022bf4,d2f9c4aa4b52d,0c52899be9643,18608b89e76bd..cb7dc99d8b290
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@@@@@@ -1286,14 -1285,13 -1285,13 -1285,13 -1286,10 -1285,10 -1285,10 +1287,14 @@@@@@@@ static const struct hid_device_id hid_b
       	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
       	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
       	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
    +++	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_T91MT) },
    +++	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUSTEK_MULTITOUCH_YFO) },
       	{ HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
       	{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE) },
    +++	{ HID_USB_DEVICE(USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_EMPREX_REMOTE_2) },
       	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH) },
       	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_11_6) },
 ++++++	{ HID_USB_DEVICE(USB_VENDOR_ID_CANDO, USB_DEVICE_ID_CANDO_MULTI_TOUCH_15_6) },
       	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
       	{ HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION_SOLAR) },
       	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
diff --cc drivers/hid/usbhid/hid-core.c
index 7a778ac4c5cb2,599041a7f670a,599041a7f670a,39913f51d8814,b729c02866798,b729c02866798,b729c02866798..5489eab3a6bd0
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@@@@@@@ -807,10 -807,9 -807,9 -807,9 -807,9 -807,9 -807,9 +807,10 @@@@@@@@ static int usbhid_output_raw_report(str
       	struct usb_host_interface *interface = intf->cur_altsetting;
       	int ret;
       
--- ---	if (usbhid->urbout) {
+++ +++	if (usbhid->urbout && report_type != HID_FEATURE_REPORT) {
       		int actual_length;
       		int skipped_report_id = 0;
 ++++++
       		if (buf[0] == 0x0) {
       			/* Don't send the Report ID */
       			buf++;
diff --cc drivers/hid/usbhid/hid-quirks.c
index f90e937b577f9,70da3181c8a04,7ff7e3d4b950a,70da3181c8a04,2643d31476213,2643d31476213,2643d31476213..836a87473c585
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@@@@@@@ -33,10 -33,9 -33,8 -33,9 -33,8 -33,8 -33,8 +33,9 @@@@@@@@ static const struct hid_blacklist 
       	{ USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_PREDATOR, HID_QUIRK_BADPAD },
       	{ USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD, HID_QUIRK_BADPAD },
       	{ USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD, HID_QUIRK_BADPAD },
    ---	{ USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH, HID_QUIRK_MULTI_INPUT },
    +++	{ USB_VENDOR_ID_DWAV, USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER, HID_QUIRK_MULTI_INPUT | HID_QUIRK_NOGET },
-- -   	{ USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH, HID_QUIRK_MULTI_INPUT },
       	{ USB_VENDOR_ID_MOJO, USB_DEVICE_ID_RETRO_ADAPTER, HID_QUIRK_MULTI_INPUT },
 ++++++	{ USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_TOUCHSCREEN_MOSART, HID_QUIRK_MULTI_INPUT },
       	{ USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
       	{ USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
       	{ USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },