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

Commit 1ad0bc78 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull HID updates from Jiri Kosina:

 - syzbot memory corruption fixes for hidraw, Prodikeys, Logitech and
   Sony drivers from Alan Stern and Roderick Colenbrander

 - stuck 'fn' key fix for hid-apple from Joao Moreno

 - proper propagation of EPOLLOUT from hiddev and hidraw, from Fabian
   Henneke

 - fixes for handling power management for intel-ish devices with NO_D3
   flag set, from Zhang Lixu

 - extension of supported usage range for customer page, as some
   Logitech devices are actually making use of it. From Olivier Gay.

 - hid-multitouch is no longer filtering mice node creation, from
   Benjamin Tissoires

 - MobileStudio Pro 13 support, from Ping Cheng

 - a few other device ID additions and assorted smaller fixes

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid: (27 commits)
  HID: core: fix dmesg flooding if report field larger than 32bit
  HID: core: Add printk_once variants to hid_warn() etc
  HID: core: reformat and reduce hid_printk macros
  HID: prodikeys: Fix general protection fault during probe
  HID: wacom: add new MobileStudio Pro 13 support
  HID: sony: Fix memory corruption issue on cleanup.
  HID: i2c-hid: modify quirks for weida's devices
  HID: apple: Fix stuck function keys when using FN
  HID: sb0540: add support for Creative SB0540 IR receivers
  HID: Add quirk for HP X500 PIXART OEM mouse
  HID: logitech-dj: Fix crash when initial logi_dj_recv_query_paired_devices fails
  hid-logitech-dj: add the new Lightspeed receiver
  HID: logitech-dj: add support of the G700(s) receiver
  HID: multitouch: add support for the Smart Tech panel
  HID: multitouch: do not filter mice nodes
  HID: do not call hid_set_drvdata(hdev, NULL) in drivers
  HID: wacom: do not call hid_set_drvdata(hdev, NULL)
  HID: logitech: Fix general protection fault caused by Logitech driver
  HID: hidraw: Fix invalid read in hidraw_ioctl
  HID: wacom: support named keys on older devices
  ...
parents 1b5fb415 8ca06d6f

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -4338,6 +4338,12 @@ S: Maintained 
F:	Documentation/filesystems/cramfs.txt

F:	fs/cramfs/













CREATIVE SB0540













M:	Bastien Nocera <hadess@hadess.net>













L:	linux-input@vger.kernel.org













S:	Maintained













F:	drivers/hid/hid-creative-sb0540.c



























CRYPTO API















M:	Herbert Xu <herbert@gondor.apana.org.au>















M:	"David S. Miller" <davem@davemloft.net>

































drivers/hid/Kconfig



+9
−0




























Original line number
Diff line number
Diff line








@@ -273,6 +273,15 @@ config HID_CP2112













	and gpiochip to expose these functions of the CP2112. The















	customizable USB descriptor fields are exposed as sysfs attributes.





























config HID_CREATIVE_SB0540













	tristate "Creative SB0540 infrared receiver"













	depends on USB_HID













	help













	Support for Creative infrared SB0540-compatible remote controls, such













	as the RM-1500 and RM-1800 remotes.



























	Say Y here if you want support for Creative SB0540 infrared receiver.





























config HID_CYPRESS















	tristate "Cypress mouse and barcode readers"















	depends on HID

































drivers/hid/Makefile



+1
−0




























Original line number
Diff line number
Diff line








@@ -27,6 +27,7 @@ obj-$(CONFIG_HID_ALPS)		+= hid-alps.o













obj-$(CONFIG_HID_ACRUX)		+= hid-axff.o















obj-$(CONFIG_HID_APPLE)		+= hid-apple.o















obj-$(CONFIG_HID_APPLEIR)	+= hid-appleir.o













obj-$(CONFIG_HID_CREATIVE_SB0540)	+= hid-creative-sb0540.o















obj-$(CONFIG_HID_ASUS)		+= hid-asus.o















obj-$(CONFIG_HID_AUREAL)	+= hid-aureal.o















obj-$(CONFIG_HID_BELKIN)	+= hid-belkin.o

































drivers/hid/hid-apple.c



+28
−21




























Original line number
Diff line number
Diff line








@@ -54,7 +54,6 @@ MODULE_PARM_DESC(swap_opt_cmd, "Swap the Option (\"Alt\") and Command (\"Flag\")













struct apple_sc {















	unsigned long quirks;















	unsigned int fn_on;













	DECLARE_BITMAP(pressed_fn, KEY_CNT);















	DECLARE_BITMAP(pressed_numlock, KEY_CNT);















};


























@@ -181,6 +180,8 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,













{















	struct apple_sc *asc = hid_get_drvdata(hid);















	const struct apple_key_translation *trans, *table;













	bool do_translate;













	u16 code = 0;































	if (usage->code == KEY_FN) {















		asc->fn_on = !!value;









@@ -189,8 +190,6 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,













	}































	if (fnmode) {













		int do_translate;





























		if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI &&















				hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS)















			table = macbookair_fn_keys;









@@ -202,26 +201,34 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,













		trans = apple_find_translation (table, usage->code);































		if (trans) {













			if (test_bit(usage->code, asc->pressed_fn))













				do_translate = 1;













			else if (trans->flags & APPLE_FLAG_FKEY)













				do_translate = (fnmode == 2 && asc->fn_on) ||













					(fnmode == 1 && !asc->fn_on);













			else













			if (test_bit(trans->from, input->key))













				code = trans->from;













			else if (test_bit(trans->to, input->key))













				code = trans->to;



























			if (!code) {













				if (trans->flags & APPLE_FLAG_FKEY) {













					switch (fnmode) {













					case 1:













						do_translate = !asc->fn_on;













						break;













					case 2:















						do_translate = asc->fn_on;













						break;













					default:













						/* should never happen */













						do_translate = false;













					}













				} else {













					do_translate = asc->fn_on;













				}





























			if (do_translate) {













				if (value)













					set_bit(usage->code, asc->pressed_fn);













				else













					clear_bit(usage->code, asc->pressed_fn);



























				input_event(input, usage->type, trans->to,













						value);













				code = do_translate ? trans->to : trans->from;













			}





























			input_event(input, usage->type, code, value);















			return 1;















		}













		}































		if (asc->quirks & APPLE_NUMLOCK_EMULATION &&















				(test_bit(usage->code, asc->pressed_numlock) ||

































drivers/hid/hid-core.c



+2
−2




























Original line number
Diff line number
Diff line








@@ -1311,8 +1311,8 @@ u32 hid_field_extract(const struct hid_device *hid, u8 *report,













			unsigned offset, unsigned n)















{















	if (n > 32) {













		hid_warn(hid, "hid_field_extract() called with n (%d) > 32! (%s)\n",













			 n, current->comm);













		hid_warn_once(hid, "%s() called with n (%d) > 32! (%s)\n",













			      __func__, n, current->comm);















		n = 32;















	}