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

Commit 4222721e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid 

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
  HID: fix pb_fnmode and move it to generic HID
  HID: fix hid-input mapping for Firefly Mini Remote Control
  USB HID: fix hid_blacklist clash for 0x08ca/0x0010
  HID: fix memleaking of collection
parents 41c57a87 76398f96

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -543,6 +543,7 @@ void hid_free_device(struct hid_device *device) 
	}



	kfree(device->rdesc);

	kfree(device->collection);

	kfree(device);

}

EXPORT_SYMBOL_GPL(hid_free_device);

drivers/hid/hid-input.c

+10 −3
Original line number Diff line number Diff line
@@ -35,6 +35,11 @@ 


#include <linux/hid.h>



static int hid_pb_fnmode = 1;

module_param_named(pb_fnmode, hid_pb_fnmode, int, 0644);

MODULE_PARM_DESC(pb_fnmode,

		"Mode of fn key on PowerBooks (0 = disabled, 1 = fkeyslast, 2 = fkeysfirst)");



#define unk	KEY_UNKNOWN



static const unsigned char hid_keyboard[256] = {
@@ -154,7 +159,7 @@ static int hidinput_pb_event(struct hid_device *hid, struct input_dev *input, 
		return 1;

	}



	if (hid->pb_fnmode) {

	if (hid_pb_fnmode) {

		int do_translate;



		trans = find_translation(powerbook_fn_keys, usage->code);
@@ -163,8 +168,8 @@ static int hidinput_pb_event(struct hid_device *hid, struct input_dev *input, 
				do_translate = 1;

			else if (trans->flags & POWERBOOK_FLAG_FKEY)

				do_translate =

					(hid->pb_fnmode == 2 &&  (hid->quirks & HID_QUIRK_POWERBOOK_FN_ON)) ||

					(hid->pb_fnmode == 1 && !(hid->quirks & HID_QUIRK_POWERBOOK_FN_ON));

					(hid_pb_fnmode == 2 &&  (hid->quirks & HID_QUIRK_POWERBOOK_FN_ON)) ||

					(hid_pb_fnmode == 1 && !(hid->quirks & HID_QUIRK_POWERBOOK_FN_ON));

			else

				do_translate = (hid->quirks & HID_QUIRK_POWERBOOK_FN_ON);
@@ -431,6 +436,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 
				case 0x040: map_key_clear(KEY_MENU);		break;

				case 0x045: map_key_clear(KEY_RADIO);		break;



				case 0x083: map_key_clear(KEY_LAST);		break;

				case 0x088: map_key_clear(KEY_PC);		break;

				case 0x089: map_key_clear(KEY_TV);		break;

				case 0x08a: map_key_clear(KEY_WWW);		break;
@@ -448,6 +454,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 
				case 0x096: map_key_clear(KEY_TAPE);		break;

				case 0x097: map_key_clear(KEY_TV2);		break;

				case 0x098: map_key_clear(KEY_SAT);		break;

				case 0x09a: map_key_clear(KEY_PVR);		break;



				case 0x09c: map_key_clear(KEY_CHANNELUP);	break;

				case 0x09d: map_key_clear(KEY_CHANNELDOWN);	break;

drivers/usb/input/hid-core.c

+0 −12
Original line number Diff line number Diff line
@@ -56,11 +56,6 @@ static unsigned int hid_mousepoll_interval; 
module_param_named(mousepoll, hid_mousepoll_interval, uint, 0644);

MODULE_PARM_DESC(mousepoll, "Polling interval of mice");



static int usbhid_pb_fnmode = 1;

module_param_named(pb_fnmode, usbhid_pb_fnmode, int, 0644);

MODULE_PARM_DESC(pb_fnmode,

		"Mode of fn key on PowerBooks (0 = disabled, 1 = fkeyslast, 2 = fkeysfirst)");



/*

 * Input submission and I/O error handler.

 */
@@ -582,7 +577,6 @@ void usbhid_init_reports(struct hid_device *hid) 
}



#define USB_VENDOR_ID_GTCO		0x078c

#define USB_VENDOR_ID_GTCO_IPANEL_1	0x08ca

#define USB_VENDOR_ID_GTCO_IPANEL_2     0x5543

#define USB_DEVICE_ID_GTCO_90		0x0090

#define USB_DEVICE_ID_GTCO_100		0x0100
@@ -629,7 +623,6 @@ void usbhid_init_reports(struct hid_device *hid) 
#define USB_DEVICE_ID_GTCO_1004		0x1004

#define USB_DEVICE_ID_GTCO_1005		0x1005

#define USB_DEVICE_ID_GTCO_1006		0x1006

#define USB_DEVICE_ID_GTCO_10		0x0010

#define USB_DEVICE_ID_GTCO_8		0x0008

#define USB_DEVICE_ID_GTCO_d            0x000d
@@ -883,7 +876,6 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1004, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1005, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1006, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO_IPANEL_1, USB_DEVICE_ID_GTCO_10, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO_IPANEL_2, USB_DEVICE_ID_GTCO_8, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_GTCO_IPANEL_2, USB_DEVICE_ID_GTCO_d, HID_QUIRK_IGNORE },

	{ USB_VENDOR_ID_IMATION, USB_DEVICE_ID_DISC_STAKKA, HID_QUIRK_IGNORE },
@@ -1249,10 +1241,6 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf) 
	hid->hiddev_hid_event = hiddev_hid_event;

	hid->hiddev_report_event = hiddev_report_event;

#endif

#ifdef CONFIG_USB_HIDINPUT_POWERBOOK

	hid->pb_fnmode = usbhid_pb_fnmode;

#endif



	return hid;



fail:

include/linux/hid.h

+0 −1
Original line number Diff line number Diff line
@@ -438,7 +438,6 @@ struct hid_device { /* device report descriptor */ 
				  struct hid_usage *, __s32);

	void (*hiddev_report_event) (struct hid_device *, struct hid_report *);

#ifdef CONFIG_USB_HIDINPUT_POWERBOOK

	unsigned int  pb_fnmode;

	unsigned long pb_pressed_fn[NBITS(KEY_MAX)];

	unsigned long pb_pressed_numlock[NBITS(KEY_MAX)];

#endif