Merge branch 'for-4.17/upstream' into for-linus

Pull a few small generic code cleanups.
This commit is contained in:
Jiri Kosina
2018-04-05 13:28:46 +02:00
9 changed files with 56 additions and 65 deletions

View File

@@ -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) {