diff options
author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2016-11-21 11:48:42 +0100 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2016-11-23 17:43:25 +0100 |
commit | 6dab07df555b652d8d989348b2ce04498d7f9a70 (patch) | |
tree | b5328936be55aade3fbac0fc484313a522b6fd57 /drivers/hid/hid-rmi.c | |
parent | b7a87ad6775f3ed69e6573b91ed3c2f1338884ad (diff) | |
download | op-kernel-dev-6dab07df555b652d8d989348b2ce04498d7f9a70.zip op-kernel-dev-6dab07df555b652d8d989348b2ce04498d7f9a70.tar.gz |
HID: rmi: make transfer buffers DMA capable
Kernel v4.9 strictly enforces DMA capable buffers, so we need to remove
buffers allocated on the stack.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-rmi.c')
-rw-r--r-- | drivers/hid/hid-rmi.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c index 9cd2ca3..be89bcb 100644 --- a/drivers/hid/hid-rmi.c +++ b/drivers/hid/hid-rmi.c @@ -188,10 +188,16 @@ static int rmi_set_page(struct hid_device *hdev, u8 page) static int rmi_set_mode(struct hid_device *hdev, u8 mode) { int ret; - u8 txbuf[2] = {RMI_SET_RMI_MODE_REPORT_ID, mode}; + const u8 txbuf[2] = {RMI_SET_RMI_MODE_REPORT_ID, mode}; + u8 *buf; - ret = hid_hw_raw_request(hdev, RMI_SET_RMI_MODE_REPORT_ID, txbuf, + buf = kmemdup(txbuf, sizeof(txbuf), GFP_KERNEL); + if (!buf) + return -ENOMEM; + + ret = hid_hw_raw_request(hdev, RMI_SET_RMI_MODE_REPORT_ID, buf, sizeof(txbuf), HID_FEATURE_REPORT, HID_REQ_SET_REPORT); + kfree(buf); if (ret < 0) { dev_err(&hdev->dev, "unable to set rmi mode to %d (%d)\n", mode, ret); |