diff options
author | Jiri Kosina <jkosina@suse.cz> | 2018-04-05 13:28:46 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2018-04-05 13:28:46 +0200 |
commit | e2d39e0f95cb414b1fb6530f8429ad411586922b (patch) | |
tree | 58ebf7762babc6fd8fd443fde9002cc7aa89202f /drivers/hid/hid-asus.c | |
parent | 108ff0e8012ae10708168940c7474318fb343751 (diff) | |
parent | 2ddc8e2d2b5902b376fee51585c8eed72b8836e7 (diff) |
Merge branch 'for-4.17/upstream' into for-linus
Pull a few small generic code cleanups.
Diffstat (limited to 'drivers/hid/hid-asus.c')
-rw-r--r-- | drivers/hid/hid-asus.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index cc738ebf93ac..88a5672f42cd 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -570,7 +570,9 @@ static int asus_input_mapping(struct hid_device *hdev, static int asus_start_multitouch(struct hid_device *hdev) { int ret; - const unsigned char buf[] = { FEATURE_REPORT_ID, 0x00, 0x03, 0x01, 0x00 }; + static const unsigned char buf[] = { + FEATURE_REPORT_ID, 0x00, 0x03, 0x01, 0x00 + }; unsigned char *dmabuf = kmemdup(buf, sizeof(buf), GFP_KERNEL); if (!dmabuf) { |