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

Browse source

Pull HID fixes from Jiri Kosina:

 - hid-dr regression fix for certain dragonrise gamepads (device ID
   0079:0006), from Ioan-Adrian Ratiu

 - dma-on-stack fix for hid-led driver, from Heiner Kallweit

 - quirk for Akai MIDImix device

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: add quirk for Akai MIDImix.
  Revert "HID: dragonrise: fix HID Descriptor for 0x0006 PID"
  HID: hid-dr: add input mapping for axis selection
  HID: hid-led: fix issue with transfer buffer not being dma capable

...

This commit is contained in:

Linus Torvalds 2016-10-19 09:56:57 -07:00

parent b6ffb11e4e 4973ca9a01

commit 8a1e377e55

4 changed files with 48 additions and 62 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

83

drivers/hid/hid-dr.c

View file

3

drivers/hid/hid-ids.h

View file

23

drivers/hid/hid-led.c

View file

1

drivers/hid/usbhid/hid-quirks.c

View file