diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2019-03-05 09:25:12 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2019-03-05 09:25:12 -0500 |
| commit | 3a69ae20cbc36f302b4b57e0de577b85dfbebba5 (patch) | |
| tree | 3f720631b6f388bde26c30cdcee8a33e7ad74f8e | |
| parent | 2c2e5bb97544198a62e4edbf6aca5dd201979564 (diff) | |
| parent | 8471300fce4cf2593267d07d6db50709c89049b4 (diff) | |
Merge branch 'for-5.1/hid-elan' into for-linus
| -rw-r--r-- | drivers/hid/hid-elan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-elan.c b/drivers/hid/hid-elan.c index 0bfd6d1b44c1..1c62095cee99 100644 --- a/drivers/hid/hid-elan.c +++ b/drivers/hid/hid-elan.c | |||
| @@ -393,7 +393,7 @@ static int elan_start_multitouch(struct hid_device *hdev) | |||
| 393 | * This byte sequence will enable multitouch mode and disable | 393 | * This byte sequence will enable multitouch mode and disable |
| 394 | * mouse emulation | 394 | * mouse emulation |
| 395 | */ | 395 | */ |
| 396 | const unsigned char buf[] = { 0x0D, 0x00, 0x03, 0x21, 0x00 }; | 396 | static const unsigned char buf[] = { 0x0D, 0x00, 0x03, 0x21, 0x00 }; |
| 397 | unsigned char *dmabuf = kmemdup(buf, sizeof(buf), GFP_KERNEL); | 397 | unsigned char *dmabuf = kmemdup(buf, sizeof(buf), GFP_KERNEL); |
| 398 | 398 | ||
| 399 | if (!dmabuf) | 399 | if (!dmabuf) |