Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecc96e79 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: Add support for Sony Vaio VGX-TP1E
  HID: fix lock imbalance in hiddev
  HID: fix lock imbalance in hidraw
  HID: fix hidbus/appletouch device binding regression
  HID: add hid_type to general hid struct
  HID: quirk for OLED devices present in ASUS G50/G70/G71
  HID: Remove "default m" for Thrustmaster and Zeroplus
  HID: fix hidraw_exit section mismatch
  HID: add support for another Gyration remote control
  Revert "HID: Invert HWHEEL mappings for some Logitech mice"
parents a1a739c5 cc6e0bbb

drivers/hid/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -247,7 +247,6 @@ config HID_SUNPLUS 


config THRUSTMASTER_FF

	tristate "ThrustMaster devices support"

	default m

	depends on USB_HID

	select INPUT_FF_MEMLESS

	help
@@ -256,7 +255,6 @@ config THRUSTMASTER_FF 


config ZEROPLUS_FF

	tristate "Zeroplus based game controller support"

	default m

	depends on USB_HID

	select INPUT_FF_MEMLESS

	help

drivers/hid/hid-apple.c

+22 −41
Original line number Diff line number Diff line
@@ -312,13 +312,6 @@ static int apple_probe(struct hid_device *hdev, 
	unsigned int connect_mask = HID_CONNECT_DEFAULT;

	int ret;



	/* return something else or move to hid layer? device will reside

	   allocated */

	if (id->bus == BUS_USB && (quirks & APPLE_IGNORE_MOUSE) &&

			to_usb_interface(hdev->dev.parent)->cur_altsetting->

			desc.bInterfaceProtocol == USB_INTERFACE_PROTOCOL_MOUSE)

		return -ENODEV;



	asc = kzalloc(sizeof(*asc), GFP_KERNEL);

	if (asc == NULL) {

		dev_err(&hdev->dev, "can't alloc apple descriptor\n");
@@ -367,38 +360,32 @@ static const struct hid_device_id apple_devices[] = { 
		.driver_data = APPLE_MIGHTYMOUSE | APPLE_INVERT_HWHEEL },



	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_IGNORE_MOUSE },

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ISO),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_IGNORE_MOUSE },

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_IGNORE_MOUSE },

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_IGNORE_MOUSE | APPLE_ISO_KEYBOARD },

			APPLE_ISO_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_IGNORE_MOUSE },

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_IGNORE_MOUSE },

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_IGNORE_MOUSE | APPLE_ISO_KEYBOARD },

			APPLE_ISO_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },

			APPLE_RDESC_JIS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_IGNORE_MOUSE },

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_IGNORE_MOUSE | APPLE_ISO_KEYBOARD },

			APPLE_ISO_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS},

			APPLE_RDESC_JIS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO),
@@ -406,14 +393,12 @@ static const struct hid_device_id apple_devices[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_IGNORE_MOUSE },

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_IGNORE_MOUSE },

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },

			APPLE_RDESC_JIS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO),
@@ -422,25 +407,21 @@ static const struct hid_device_id apple_devices[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),

		.driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE },

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO),

		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD |

			APPLE_IGNORE_MOUSE },

		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS),

		.driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },

		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI),

		.driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE },

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO),

		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD |

			APPLE_IGNORE_MOUSE },

		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS),

		.driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },

		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_IGNORE_MOUSE },

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_IGNORE_MOUSE },

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },



	/* Apple wireless Mighty Mouse */

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c),

drivers/hid/hid-core.c

+41 −2
Original line number Diff line number Diff line
@@ -1264,6 +1264,7 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) },
@@ -1275,8 +1276,6 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KBD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_ELITE_KBD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_LX3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_V150) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_EXTREME_3D) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WHEEL) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD) },
@@ -1295,6 +1294,7 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },

	{ HID_USB_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_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },



	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c) },
@@ -1406,6 +1406,7 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_AIRCABLE, USB_DEVICE_ID_AIRCABLE1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ALCOR, USB_DEVICE_ID_ALCOR_USBRS232) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_LCM)},

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_LCM2)},

	{ HID_USB_DEVICE(USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CIDC, 0x0103) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_RADIO_SI470X) },
@@ -1541,6 +1542,40 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ }

};



/**

 * hid_mouse_ignore_list - mouse devices which should not be handled by the hid layer

 *

 * There are composite devices for which we want to ignore only a certain

 * interface. This is a list of devices for which only the mouse interface will

 * be ignored. This allows a dedicated driver to take care of the interface.

 */

static const struct hid_device_id hid_mouse_ignore_list[] = {

	/* appletouch driver */

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_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) },

	{ }

};



static bool hid_ignore(struct hid_device *hdev)

{

	switch (hdev->vendor) {
@@ -1557,6 +1592,10 @@ static bool hid_ignore(struct hid_device *hdev) 
		break;

	}



	if (hdev->type == HID_TYPE_USBMOUSE &&

			hid_match_id(hdev, hid_mouse_ignore_list))

		return true;



	return !!hid_match_id(hdev, hid_ignore_list);

}

drivers/hid/hid-gyration.c

+3 −1
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ 
 *  Copyright (c) 1999 Andreas Gal

 *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>

 *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc

 *  Copyright (c) 2006-2007 Jiri Kosina

 *  Copyright (c) 2007 Paul Walmsley

 *  Copyright (c) 2008 Jiri Slaby

 *  Copyright (c) 2006-2008 Jiri Kosina

 */



/*
@@ -40,6 +40,7 @@ static int gyration_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
	case 0x025: gy_map_key_clear(KEY_PVR);		break;

	case 0x046: gy_map_key_clear(KEY_MEDIA);	break;

	case 0x047: gy_map_key_clear(KEY_MP3);		break;

	case 0x048: gy_map_key_clear(KEY_MEDIA);	break;

	case 0x049: gy_map_key_clear(KEY_CAMERA);	break;

	case 0x04a: gy_map_key_clear(KEY_VIDEO);	break;
@@ -68,6 +69,7 @@ static int gyration_event(struct hid_device *hdev, struct hid_field *field, 


static const struct hid_device_id gyration_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },

	{ }

};

MODULE_DEVICE_TABLE(hid, gyration_devices);

drivers/hid/hid-ids.h

+3 −2
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ 


#define USB_VENDOR_ID_ASUS		0x0b05

#define USB_DEVICE_ID_ASUS_LCM		0x1726

#define USB_DEVICE_ID_ASUS_LCM2		0x175b



#define USB_VENDOR_ID_ATEN		0x0557

#define USB_DEVICE_ID_ATEN_UC100KM	0x2004
@@ -236,6 +237,7 @@ 


#define USB_VENDOR_ID_GYRATION		0x0c16

#define USB_DEVICE_ID_GYRATION_REMOTE	0x0002

#define USB_DEVICE_ID_GYRATION_REMOTE_2 0x0003



#define USB_VENDOR_ID_HAPP		0x078b

#define USB_DEVICE_ID_UGCI_DRIVING	0x0010
@@ -268,8 +270,6 @@ 
#define USB_DEVICE_ID_LD_MACHINETEST	0x2040



#define USB_VENDOR_ID_LOGITECH		0x046d

#define USB_DEVICE_ID_LOGITECH_LX3	0xc044

#define USB_DEVICE_ID_LOGITECH_V150	0xc047

#define USB_DEVICE_ID_LOGITECH_RECEIVER	0xc101

#define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST  0xc110

#define USB_DEVICE_ID_LOGITECH_HARMONY_LAST 0xc14f
@@ -350,6 +350,7 @@ 
#define USB_DEVICE_ID_SAMSUNG_IR_REMOTE	0x0001



#define USB_VENDOR_ID_SONY			0x054c

#define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE	0x024b

#define USB_DEVICE_ID_SONY_PS3_CONTROLLER	0x0268



#define USB_VENDOR_ID_SOUNDGRAPH	0x15c2