diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-01 15:18:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-01 15:18:42 -0700 |
| commit | c101e9bbce4ae2947b35a660f17d617fc3827595 (patch) | |
| tree | 679292eb6e5423be802b7d4b6b7abe7ffc7727b6 /drivers/hid/intel-ish-hid/ishtp | |
| parent | 69c1fd97266bcdcfdba1e3ea57773c80e0551e1a (diff) | |
| parent | 4f8a21a6a9335fdf0952af3cadfa88c33dddacd6 (diff) | |
| download | linux-c101e9bbce4ae2947b35a660f17d617fc3827595.tar.gz linux-c101e9bbce4ae2947b35a660f17d617fc3827595.tar.bz2 linux-c101e9bbce4ae2947b35a660f17d617fc3827595.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid
Pull HID updates from Jiri Kosina:
- Logitech HID++ protocol support improvement from Filipe Laíns
- probe fix for Logitech-G* devices from Hans de Goede
- a few other small code cleanups and support for new device IDs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
HID: rmi: Simplify an error handling path in 'rmi_hid_read_block()'
HID: intel-ish-hid: hbm.h: Replace zero-length array with flexible-array member
HID: intel-ish-hid: ishtp-dev.h: Replace zero-length array with flexible-array member
HID: Add driver fixing Glorious PC Gaming Race mouse report descriptor
HID: lg-g15: Do not fail the probe when we fail to disable F# emulation
HID: appleir: Use devm_kzalloc() instead of kzalloc()
HID: appleir: Remove unnecessary goto label
HID: logitech-dj: add support for the static device in the Powerplay mat/receiver
HID: mcp2221: add usb to i2c-smbus host bridge
HID: logitech-dj: add debug msg when exporting a HID++ report descriptors
HID: quirks: Remove ITE 8595 entry from hid_have_special_driver
Diffstat (limited to 'drivers/hid/intel-ish-hid/ishtp')
| -rw-r--r-- | drivers/hid/intel-ish-hid/ishtp/hbm.h | 2 | ||||
| -rw-r--r-- | drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/intel-ish-hid/ishtp/hbm.h b/drivers/hid/intel-ish-hid/ishtp/hbm.h index bb85985b1620..7c445b203f2a 100644 --- a/drivers/hid/intel-ish-hid/ishtp/hbm.h +++ b/drivers/hid/intel-ish-hid/ishtp/hbm.h @@ -82,7 +82,7 @@ struct ishtp_msg_hdr { struct ishtp_bus_message { uint8_t hbm_cmd; - uint8_t data[0]; + uint8_t data[]; } __packed; /** diff --git a/drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h b/drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h index 39e0e6c73adf..1cc6364aa957 100644 --- a/drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h +++ b/drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h @@ -214,7 +214,7 @@ struct ishtp_device { const struct ishtp_hw_ops *ops; size_t mtu; uint32_t ishtp_msg_hdr; - char hw[0] __aligned(sizeof(void *)); + char hw[] __aligned(sizeof(void *)); }; static inline unsigned long ishtp_secs_to_jiffies(unsigned long sec) |