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

Commit 2f9d1955 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "HID: check for valid USB device for many HID drivers"

parents 34bb42eb 8c0432fb

drivers/hid/hid-chicony.c

+6 −2
Original line number Diff line number Diff line
@@ -61,8 +61,12 @@ static int ch_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
static __u8 *ch_switch12_report_fixup(struct hid_device *hdev, __u8 *rdesc,

		unsigned int *rsize)

{

	struct usb_interface *intf = to_usb_interface(hdev->dev.parent);

	struct usb_interface *intf;



	if (!hid_is_usb(hdev))

		return rdesc;



	intf = to_usb_interface(hdev->dev.parent);

	if (intf->cur_altsetting->desc.bInterfaceNumber == 1) {

		/* Change usage maximum and logical maximum from 0x7fff to

		 * 0x2fff, so they don't exceed HID_MAX_USAGES */

drivers/hid/hid-corsair.c

+6 −1
Original line number Diff line number Diff line
@@ -556,7 +556,12 @@ static int corsair_probe(struct hid_device *dev, const struct hid_device_id *id) 
	int ret;

	unsigned long quirks = id->driver_data;

	struct corsair_drvdata *drvdata;

	struct usb_interface *usbif = to_usb_interface(dev->dev.parent);

	struct usb_interface *usbif;



	if (!hid_is_usb(dev))

		return -EINVAL;



	usbif = to_usb_interface(dev->dev.parent);



	drvdata = devm_kzalloc(&dev->dev, sizeof(struct corsair_drvdata),

			       GFP_KERNEL);

drivers/hid/hid-elan.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ struct elan_drvdata { 


static int is_not_elan_touchpad(struct hid_device *hdev)

{

	if (hdev->bus == BUS_USB) {

	if (hid_is_usb(hdev)) {

		struct usb_interface *intf = to_usb_interface(hdev->dev.parent);



		return (intf->altsetting->desc.bInterfaceNumber !=

drivers/hid/hid-elo.c

+3 −0
Original line number Diff line number Diff line
@@ -230,6 +230,9 @@ static int elo_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	struct elo_priv *priv;

	int ret;



	if (!hid_is_usb(hdev))

		return -EINVAL;



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

	if (!priv)

		return -ENOMEM;

drivers/hid/hid-holtek-kbd.c

+7 −2
Original line number Diff line number Diff line
@@ -143,12 +143,17 @@ static int holtek_kbd_input_event(struct input_dev *dev, unsigned int type, 
static int holtek_kbd_probe(struct hid_device *hdev,

		const struct hid_device_id *id)

{

	struct usb_interface *intf = to_usb_interface(hdev->dev.parent);

	int ret = hid_parse(hdev);

	struct usb_interface *intf;

	int ret;



	if (!hid_is_usb(hdev))

		return -EINVAL;



	ret = hid_parse(hdev);

	if (!ret)

		ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);



	intf = to_usb_interface(hdev->dev.parent);

	if (!ret && intf->cur_altsetting->desc.bInterfaceNumber == 1) {

		struct hid_input *hidinput;

		list_for_each_entry(hidinput, &hdev->inputs, list) {