From: Jiri Kosina <jkosina@suse.cz>
Date: Thu, 5 Apr 2018 11:19:57 +0000 (+0200)
Subject: Merge branch 'for-4.17/multitouch' into for-linus
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=af73686e7bfe49fbbccc099995be8c78ce5bfe9a;p=linux.git

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

Pull Razer Blade Stealth support improvement and a few generic cleanups
---

af73686e7bfe49fbbccc099995be8c78ce5bfe9a
diff --cc drivers/hid/hid-multitouch.c
index 2e1736ba2444d,6ae2d14146b3b..ba32f0172030f
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@@ -369,9 -379,7 +379,8 @@@ static const struct attribute_group mt_
  
  static void mt_get_feature(struct hid_device *hdev, struct hid_report *report)
  {
- 	struct mt_device *td = hid_get_drvdata(hdev);
 -	int ret, size = hid_report_len(report);
 +	int ret;
 +	u32 size = hid_report_len(report);
  	u8 *buf;
  
  	/*