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

Commit c07f62e5 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: Apple ALU wireless keyboards are bluetooth devices
  HID: remove setup mutex, fix possible deadlock
  HID: add USB ID for another dual gameron adapter
  HID: unignore mouse on unibody macbooks
  HID: fix blacklist entries for greenasia/pantherlord
parents e5404586 ee8a1a0a

drivers/hid/hid-apple.c

+3 −3
Original line number Diff line number Diff line
@@ -400,12 +400,12 @@ static const struct hid_device_id apple_devices[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS),

		.driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |

			APPLE_RDESC_JIS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI),

	{ HID_BLUETOOTH_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),

	{ 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_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS),

	{ 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),

		.driver_data = APPLE_HAS_FN },

drivers/hid/hid-core.c

+6 −8
Original line number Diff line number Diff line
@@ -1241,9 +1241,9 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ 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_ALU_WIRELESS_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_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) },
@@ -1266,6 +1266,9 @@ 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_GENERIC_13BA, USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003) },

	{ 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) },
@@ -1420,7 +1423,6 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0001) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0002) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GENERAL_TOUCH, 0x0003) },
@@ -1436,7 +1438,6 @@ static const struct hid_device_id hid_ignore_list[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_SUPER_Q2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_GOGOPEN) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GOTOP, USB_DEVICE_ID_PENPOWER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GRETAGMACBETH, USB_DEVICE_ID_GRETAGMACBETH_HUEY) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_POWERMATE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GRIFFIN, USB_DEVICE_ID_SOUNDKNOB) },
@@ -1576,9 +1577,6 @@ static const struct hid_device_id hid_mouse_ignore_list[] = { 
	{ 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_WELLSPRING3_ANSI) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO) },

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

	{ }

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ 


#define USB_VENDOR_ID_GAMERON		0x0810

#define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR	0x0001

#define USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR	0x0002



#define USB_VENDOR_ID_GENERAL_TOUCH	0x0dfc

drivers/hid/hid-pl.c

+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,8 @@ static int pl_probe(struct hid_device *hdev, const struct hid_device_id *id) 
static const struct hid_device_id pl_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR),

		.driver_data = 1 }, /* Twin USB Joystick */

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR),

		.driver_data = 1 }, /* Twin USB Joystick */

	{ HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, 0x0003), }, /* GreenAsia Inc. USB Joystick */

	{ }

};

drivers/hid/usbhid/hid-core.c

+2 −16
Original line number Diff line number Diff line
@@ -796,7 +796,6 @@ static int usbhid_start(struct hid_device *hid) 
	if (insize > HID_MAX_BUFFER_SIZE)

		insize = HID_MAX_BUFFER_SIZE;



	mutex_lock(&usbhid->setup);

	if (hid_alloc_buffers(dev, hid)) {

		ret = -ENOMEM;

		goto fail;
@@ -876,7 +875,6 @@ static int usbhid_start(struct hid_device *hid) 
	hid_dump_device(hid);



	set_bit(HID_STARTED, &usbhid->iofl);

	mutex_unlock(&usbhid->setup);



	return 0;
@@ -888,7 +886,6 @@ static int usbhid_start(struct hid_device *hid) 
	usbhid->urbout = NULL;

	usbhid->urbctrl = NULL;

	hid_free_buffers(dev, hid);

	mutex_unlock(&usbhid->setup);

	return ret;

}
@@ -899,7 +896,6 @@ static void usbhid_stop(struct hid_device *hid) 
	if (WARN_ON(!usbhid))

		return;



	mutex_lock(&usbhid->setup);

	clear_bit(HID_STARTED, &usbhid->iofl);

	spin_lock_irq(&usbhid->inlock);	/* Sync with error handler */

	set_bit(HID_DISCONNECTED, &usbhid->iofl);
@@ -928,7 +924,6 @@ static void usbhid_stop(struct hid_device *hid) 
	usbhid->urbout = NULL;



	hid_free_buffers(hid_to_usb_dev(hid), hid);

	mutex_unlock(&usbhid->setup);

}



static struct hid_ll_driver usb_hid_driver = {
@@ -1016,7 +1011,6 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id) 


	hid->driver_data = usbhid;

	usbhid->hid = hid;

	mutex_init(&usbhid->setup); /* needed on suspend/resume */



	ret = hid_add_device(hid);

	if (ret) {
@@ -1051,18 +1045,14 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message) 
	struct hid_device *hid = usb_get_intfdata (intf);

	struct usbhid_device *usbhid = hid->driver_data;



	mutex_lock(&usbhid->setup);

	if (!test_bit(HID_STARTED, &usbhid->iofl)) {

		mutex_unlock(&usbhid->setup);

	if (!test_bit(HID_STARTED, &usbhid->iofl))

		return 0;

	}



	spin_lock_irq(&usbhid->inlock);	/* Sync with error handler */

	set_bit(HID_SUSPENDED, &usbhid->iofl);

	spin_unlock_irq(&usbhid->inlock);

	del_timer_sync(&usbhid->io_retry);

	usb_kill_urb(usbhid->urbin);

	mutex_unlock(&usbhid->setup);

	dev_dbg(&intf->dev, "suspend\n");

	return 0;

}
@@ -1073,16 +1063,12 @@ static int hid_resume(struct usb_interface *intf) 
	struct usbhid_device *usbhid = hid->driver_data;

	int status;



	mutex_lock(&usbhid->setup);

	if (!test_bit(HID_STARTED, &usbhid->iofl)) {

		mutex_unlock(&usbhid->setup);

	if (!test_bit(HID_STARTED, &usbhid->iofl))

		return 0;

	}



	clear_bit(HID_SUSPENDED, &usbhid->iofl);

	usbhid->retry_delay = 0;

	status = hid_start_in(hid);

	mutex_unlock(&usbhid->setup);

	dev_dbg(&intf->dev, "resume status %d\n", status);

	return status;

}