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

Commit 5e51d16d 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: fix bus endianity in file2alias
  HID: move tmff and zpff devices from ignore_list to blacklist
  HID: unlock properly on error paths in hidraw_ioctl()
  HID: blacklist Powercom USB UPS
parents 7f302fe3 2b639386

drivers/hid/hid-core.c

+7 −6
Original line number Diff line number Diff line
@@ -1300,7 +1300,13 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ 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_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TOPSEED, USB_DEVICE_ID_TOPSEED_CYBERLINK) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },



	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) },
@@ -1605,6 +1611,7 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0002) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0003) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_PANJIT, 0x0004) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_POWERCOM, USB_DEVICE_ID_POWERCOM_UPS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD3) },
@@ -1612,10 +1619,6 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD5) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TENX, USB_DEVICE_ID_TENX_IBUDDY2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb651) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP) },
@@ -1626,8 +1629,6 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_1_PHIDGETSERVO_20) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_8_8_4_IF_KIT) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },

	{ }

};

drivers/hid/hid-ids.h

+3 −0
Original line number Diff line number Diff line
@@ -348,6 +348,9 @@ 
#define USB_VENDOR_ID_PLAYDOTCOM	0x0b43

#define USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII	0x0003



#define USB_VENDOR_ID_POWERCOM		0x0d9f

#define USB_DEVICE_ID_POWERCOM_UPS	0x0002



#define USB_VENDOR_ID_SAITEK		0x06a3

#define USB_DEVICE_ID_SAITEK_RUMBLEPAD	0xff17

drivers/hid/hidraw.c

+9 −5
Original line number Diff line number Diff line
@@ -267,8 +267,10 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd, 
		default:

			{

				struct hid_device *hid = dev->hid;

				if (_IOC_TYPE(cmd) != 'H' || _IOC_DIR(cmd) != _IOC_READ)

					return -EINVAL;

				if (_IOC_TYPE(cmd) != 'H' || _IOC_DIR(cmd) != _IOC_READ) {

					ret = -EINVAL;

					break;

				}



				if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWNAME(0))) {

					int len;
@@ -277,8 +279,9 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd, 
					len = strlen(hid->name) + 1;

					if (len > _IOC_SIZE(cmd))

						len = _IOC_SIZE(cmd);

					return copy_to_user(user_arg, hid->name, len) ?

					ret = copy_to_user(user_arg, hid->name, len) ?

						-EFAULT : len;

					break;

				}



				if (_IOC_NR(cmd) == _IOC_NR(HIDIOCGRAWPHYS(0))) {
@@ -288,8 +291,9 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd, 
					len = strlen(hid->phys) + 1;

					if (len > _IOC_SIZE(cmd))

						len = _IOC_SIZE(cmd);

					return copy_to_user(user_arg, hid->phys, len) ?

					ret = copy_to_user(user_arg, hid->phys, len) ?

						-EFAULT : len;

					break;

				}

                }

scripts/mod/file2alias.c

+1 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ static void do_usb_table(void *symval, unsigned long size, 
static int do_hid_entry(const char *filename,

			     struct hid_device_id *id, char *alias)

{

	id->bus = TO_NATIVE(id->bus);

	id->vendor = TO_NATIVE(id->vendor);

	id->product = TO_NATIVE(id->product);