From: Jiri Kosina <jkosina@suse.cz>
Date: Thu, 14 Jan 2016 15:11:06 +0000 (+0100)
Subject: Merge branches 'for-4.4/upstream-fixes', 'for-4.5/async-suspend', 'for-4.5/container... 
X-Git-Tag: v4.5-rc1~97^2
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=83f1bfd6f57c422da70d1e296df1becc35c868be

Merge branches 'for-4.4/upstream-fixes', 'for-4.5/async-suspend', 'for-4.5/container-of-cleanups', 'for-4.5/core', 'for-4.5/i2c-hid', 'for-4.5/logitech', 'for-4.5/multitouch', 'for-4.5/sony', 'for-4.5/upstream' and 'for-4.5/wacom' into for-linus
---

83f1bfd6f57c422da70d1e296df1becc35c868be
diff --cc drivers/hid/hid-core.c
index ab3b86c327a3,e9ef0dd4fd89,e847fb7f5d5d,3c1cfc6d9964,c6f7a694f67a,190260c52adc,c6f7a694f67a,c6f7a694f67a,c6f7a694f67a,c6f7a694f67a..7e89288b1537
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@@@@@@@@@ -2223,12 -2223,12 -2223,12 -2217,9 -2223,12 -2224,12 -2223,12 -2223,12 -2223,12 -2223,12 +2217,9 @@@@@@@@@@@ static ssize_t modalias_show(struct dev
          			     char *buf)
          {
          	struct hid_device *hdev = container_of(dev, struct hid_device, dev);
--- ------	int len;
--  ------
--  ------	len = snprintf(buf, PAGE_SIZE, "hid:b%04Xg%04Xv%08Xp%08X\n",
--  ------		       hdev->bus, hdev->group, hdev->vendor, hdev->product);
          
  -       	len = snprintf(buf, PAGE_SIZE, "hid:b%04Xg%04Xv%08Xp%08X\n",
  -       		       hdev->bus, hdev->group, hdev->vendor, hdev->product);
  -       
--- ------	return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
+++ ++++++	return scnprintf(buf, PAGE_SIZE, "hid:b%04Xg%04Xv%08Xp%08X\n",
+++ ++++++			 hdev->bus, hdev->group, hdev->vendor, hdev->product);
          }
          static DEVICE_ATTR_RO(modalias);