diff options
author | Jiri Kosina <jkosina@suse.cz> | 2019-03-05 17:42:51 +0300 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2019-03-05 17:42:51 +0300 |
commit | 9f66d83ed704bc9ac0f09eb744f8e76a81006eb9 (patch) | |
tree | e9a9a84797e440bb14c340d8671159cffe535cc4 /drivers/hid/intel-ish-hid/ishtp/bus.h | |
parent | edaea3d904af805545073070307ca5f3afce4e18 (diff) | |
parent | 09cc8b361887787a3577aa0b6510af4b11b51b9e (diff) | |
download | linux-9f66d83ed704bc9ac0f09eb744f8e76a81006eb9.tar.xz |
Merge branch 'for-5.1/i2c-hid' into for-linus
Fix dmesg flood for Elan touchpanels which are too slow to assert IRQ from Kai-Heng Feng
Diffstat (limited to 'drivers/hid/intel-ish-hid/ishtp/bus.h')
-rw-r--r-- | drivers/hid/intel-ish-hid/ishtp/bus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/intel-ish-hid/ishtp/bus.h b/drivers/hid/intel-ish-hid/ishtp/bus.h index babf19ba3ff6..4cf7ad586c37 100644 --- a/drivers/hid/intel-ish-hid/ishtp/bus.h +++ b/drivers/hid/intel-ish-hid/ishtp/bus.h @@ -85,7 +85,7 @@ int ishtp_send_msg(struct ishtp_device *dev, /* Write a single-fragment message */ int ishtp_write_message(struct ishtp_device *dev, struct ishtp_msg_hdr *hdr, - unsigned char *buf); + void *buf); /* Use DMA to send/receive messages */ int ishtp_use_dma_transfer(void); |