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

Commit 30307c69 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:
  Revert "HID: multitouch: decide if hid-multitouch needs to handle mt devices"
  HID: drivers/hid/hid-roccat.c: eliminate a null pointer dereference
  HID: hid-apple: add device ID of another wireless aluminium
  HID: Add device IDs for Macbook Pro 8 keyboards
parents 4536e4d1 d682bd7f

drivers/hid/hid-apple.c

+9 −0
Original line number Diff line number Diff line
@@ -458,6 +458,9 @@ static const struct hid_device_id apple_devices[] = { 
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_ISO_KEYBOARD },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_ISO_KEYBOARD },

	{ HID_BLUETOOTH_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),
@@ -508,6 +511,12 @@ static const struct hid_device_id apple_devices[] = { 
		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS),

		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI),

		.driver_data = APPLE_HAS_FN },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO),

		.driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS),

		.driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),

drivers/hid/hid-core.c

+7 −0
Original line number Diff line number Diff line
@@ -1362,6 +1362,9 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_JIS) },
@@ -1374,6 +1377,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO) },

	{ 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) },
@@ -1942,6 +1946,9 @@ static const struct hid_device_id hid_mouse_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_JIS) },

drivers/hid/hid-ids.h

+4 −0
Original line number Diff line number Diff line
@@ -112,6 +112,9 @@ 
#define USB_DEVICE_ID_APPLE_ALU_REVB_ANSI	0x024f

#define USB_DEVICE_ID_APPLE_ALU_REVB_ISO	0x0250

#define USB_DEVICE_ID_APPLE_ALU_REVB_JIS	0x0251

#define USB_DEVICE_ID_APPLE_WELLSPRING5A_ANSI	0x0252

#define USB_DEVICE_ID_APPLE_WELLSPRING5A_ISO	0x0253

#define USB_DEVICE_ID_APPLE_WELLSPRING5A_JIS	0x0254

#define USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI	0x0249

#define USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO	0x024a

#define USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS	0x024b
@@ -121,6 +124,7 @@ 
#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI  0x0239

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO   0x023a

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS   0x023b

#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO   0x0256

#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY	0x030a

#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY	0x030b

#define USB_DEVICE_ID_APPLE_ATV_IRCONTROL	0x8241

drivers/hid/hid-multitouch.c

+4 −43
Original line number Diff line number Diff line
@@ -291,7 +291,6 @@ static int mt_input_mapping(struct hid_device *hdev, struct hid_input *hi, 
			td->last_slot_field = usage->hid;

			td->last_field_index = field->index;

			td->last_mt_collection = usage->collection_index;

			hdev->quirks &= ~HID_QUIRK_MULTITOUCH;

			return 1;

		case HID_DG_WIDTH:

			hid_map_usage(hi, usage, bit, max,
@@ -530,44 +529,12 @@ static void mt_set_input_mode(struct hid_device *hdev) 
	}

}



/* a list of devices for which there is a specialized multitouch driver */

static const struct hid_device_id mt_have_special_driver[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, 0x0001) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, 0x0006) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA,

			USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_QUANTA,

			USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH) },

	{ }

};



static bool mt_match_one_id(struct hid_device *hdev,

		const struct hid_device_id *id)

{

	return id->bus == hdev->bus &&

		(id->vendor == HID_ANY_ID || id->vendor == hdev->vendor) &&

		(id->product == HID_ANY_ID || id->product == hdev->product);

}



static const struct hid_device_id *mt_match_id(struct hid_device *hdev,

		const struct hid_device_id *id)

{

	for (; id->bus; id++)

		if (mt_match_one_id(hdev, id))

			return id;



	return NULL;

}



static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id)

{

	int ret, i;

	struct mt_device *td;

	struct mt_class *mtclass = mt_classes; /* MT_CLS_DEFAULT */



	if (mt_match_id(hdev, mt_have_special_driver))

		return -ENODEV;



	for (i = 0; mt_classes[i].name ; i++) {

		if (id->driver_data == mt_classes[i].name) {

			mtclass = &(mt_classes[i]);
@@ -575,6 +542,10 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id) 
		}

	}



	/* This allows the driver to correctly support devices

	 * that emit events over several HID messages.

	 */

	hdev->quirks |= HID_QUIRK_NO_INPUT_SYNC;



	td = kzalloc(sizeof(struct mt_device), GFP_KERNEL);

	if (!td) {
@@ -590,16 +561,10 @@ static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id) 
	if (ret != 0)

		goto fail;



	hdev->quirks |= HID_QUIRK_MULTITOUCH;

	ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);

	if (ret)

		goto fail;



	/* This allows the driver to correctly support devices

	 * that emit events over several HID messages.

	 */

	hdev->quirks |= HID_QUIRK_NO_INPUT_SYNC;



	td->slots = kzalloc(td->maxcontacts * sizeof(struct mt_slot),

				GFP_KERNEL);

	if (!td->slots) {
@@ -793,10 +758,6 @@ static const struct hid_device_id mt_devices[] = { 
		HID_USB_DEVICE(USB_VENDOR_ID_XAT,

			USB_DEVICE_ID_XAT_CSR) },



	/* Rest of the world */

	{ .driver_data = MT_CLS_DEFAULT,

		HID_USB_DEVICE(HID_ANY_ID, HID_ANY_ID) },



	{ }

};

MODULE_DEVICE_TABLE(hid, mt_devices);

drivers/hid/hid-roccat.c

+9 −9
Original line number Diff line number Diff line
@@ -162,27 +162,27 @@ static int roccat_open(struct inode *inode, struct file *file) 


	device = devices[minor];



	mutex_lock(&device->readers_lock);



	if (!device) {

		pr_emerg("roccat device with minor %d doesn't exist\n", minor);

		error = -ENODEV;

		goto exit_err;

		goto exit_err_devices;

	}



	mutex_lock(&device->readers_lock);



	if (!device->open++) {

		/* power on device on adding first reader */

		error = hid_hw_power(device->hid, PM_HINT_FULLON);

		if (error < 0) {

			--device->open;

			goto exit_err;

			goto exit_err_readers;

		}



		error = hid_hw_open(device->hid);

		if (error < 0) {

			hid_hw_power(device->hid, PM_HINT_NORMAL);

			--device->open;

			goto exit_err;

			goto exit_err_readers;

		}

	}
@@ -193,13 +193,13 @@ static int roccat_open(struct inode *inode, struct file *file) 
	list_add_tail(&reader->node, &device->readers);

	file->private_data = reader;



exit_unlock:

exit_err_readers:

	mutex_unlock(&device->readers_lock);

exit_err_devices:

	mutex_unlock(&devices_lock);

	return error;

exit_err:

	if (error)

		kfree(reader);

	goto exit_unlock;

	return error;

}



static int roccat_release(struct inode *inode, struct file *file)