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

Commit c4bbb398 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 

Pull HID fixes from Jiri Kosina:

 - a few fixes to Sony driver (rmmod breakage, spinlock initialization),
   by Antonio Ospite, Frank Praznik and Jiri Kosina

 - fix for wMaxInputLength handling regression in i2c-hid, by Seth
   Forshee

 - IRQ safety spinlock fix in sensor hub driver, by Srinivas Pandruvada

 - IRQ level sensitivity fix to i2c-hid to be compliant with the spec,
   by Mika Westerberg

 - a couple device ID additions piggy-backing on top of that

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: microsoft: Add ID for NE7K wireless keyboard
  HID: i2c-hid: Limit reads to wMaxInputLength bytes for input events
  HID: sony: fix uninitialized per-controller spinlock
  HID: sony: initialize sony_dev_list_lock properly
  HID: sony: Fix a WARNING shown when rmmod-ing the driver
  HID: sensor-hub: correct dyn_callback_lock IRQ-safe change
  HID: hid-sensor-hub: Correct documentation
  HID: saitek: add USB ID for older R.A.T. 7
  HID: i2c-hid: The interrupt should be level sensitive
  HID: wacom: Add missing ABS_MISC event and feature declaration for 27QHD
parents c517d838 ef567cf9

drivers/hid/hid-core.c

+2 −0
Original line number Diff line number Diff line
@@ -1872,6 +1872,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K_JP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE7K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) },
@@ -1926,6 +1927,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
#endif

#if IS_ENABLED(CONFIG_HID_SAITEK)

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_PS1000) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RAT7_OLD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RAT7) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_MMO7) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_RAT9) },

drivers/hid/hid-ids.h

+2 −0
Original line number Diff line number Diff line
@@ -654,6 +654,7 @@ 
#define USB_DEVICE_ID_MS_LK6K		0x00f9

#define USB_DEVICE_ID_MS_PRESENTER_8K_BT	0x0701

#define USB_DEVICE_ID_MS_PRESENTER_8K_USB	0x0713

#define USB_DEVICE_ID_MS_NE7K		0x071d

#define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K	0x0730

#define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500	0x076c

#define USB_DEVICE_ID_MS_SURFACE_PRO_2   0x0799
@@ -802,6 +803,7 @@ 
#define USB_VENDOR_ID_SAITEK		0x06a3

#define USB_DEVICE_ID_SAITEK_RUMBLEPAD	0xff17

#define USB_DEVICE_ID_SAITEK_PS1000	0x0621

#define USB_DEVICE_ID_SAITEK_RAT7_OLD	0x0ccb

#define USB_DEVICE_ID_SAITEK_RAT7	0x0cd7

#define USB_DEVICE_ID_SAITEK_MMO7	0x0cd0

drivers/hid/hid-microsoft.c

+2 −0
Original line number Diff line number Diff line
@@ -264,6 +264,8 @@ static const struct hid_device_id ms_devices[] = { 
		.driver_data = MS_ERGONOMY },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K_JP),

		.driver_data = MS_ERGONOMY },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE7K),

		.driver_data = MS_ERGONOMY },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K),

		.driver_data = MS_ERGONOMY | MS_RDESC },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB),

drivers/hid/hid-saitek.c

+2 −0
Original line number Diff line number Diff line
@@ -177,6 +177,8 @@ static int saitek_event(struct hid_device *hdev, struct hid_field *field, 
static const struct hid_device_id saitek_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_PS1000),

		.driver_data = SAITEK_FIX_PS1000 },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RAT7_OLD),

		.driver_data = SAITEK_RELEASE_MODE_RAT7 },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RAT7),

		.driver_data = SAITEK_RELEASE_MODE_RAT7 },

	{ HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_RAT9),

drivers/hid/hid-sensor-hub.c

+5 −3
Original line number Diff line number Diff line
@@ -135,8 +135,9 @@ static struct hid_sensor_hub_callbacks *sensor_hub_get_callback( 
{

	struct hid_sensor_hub_callbacks_list *callback;

	struct sensor_hub_data *pdata = hid_get_drvdata(hdev);

	unsigned long flags;



	spin_lock(&pdata->dyn_callback_lock);

	spin_lock_irqsave(&pdata->dyn_callback_lock, flags);

	list_for_each_entry(callback, &pdata->dyn_callback_list, list)

		if (callback->usage_id == usage_id &&

			(collection_index >=
@@ -145,10 +146,11 @@ static struct hid_sensor_hub_callbacks *sensor_hub_get_callback( 
				callback->hsdev->end_collection_index)) {

			*priv = callback->priv;

			*hsdev = callback->hsdev;

			spin_unlock(&pdata->dyn_callback_lock);

			spin_unlock_irqrestore(&pdata->dyn_callback_lock,

					       flags);

			return callback->usage_callback;

		}

	spin_unlock(&pdata->dyn_callback_lock);

	spin_unlock_irqrestore(&pdata->dyn_callback_lock, flags);



	return NULL;

}