Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

Pull HID updates from Jiri Kosina:

 - Valve Steam Controller support from Rodrigo Rivas Costa

 - Redragon Asura support from Robert Munteanu

 - improvement of duplicate usage handling in generic hid-input from
   Benjamin Tissoires

 - Win 8.1 precisioun touchpad spec implementation from Benjamin
   Tissoires

 - Support for "In Range" flag for Wacom Intuos/Bamboo devices from
   Jason Gerecke

 - other various assorted smaller fixes and improvements

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (27 commits)
  HID: rmi: use HID_QUIRK_NO_INPUT_SYNC
  HID: multitouch: fix calculation of last slot field in multi-touch reports
  HID: quirks: remove Delcom Visual Signal Indicator from hid_have_special_driver[]
  HID: steam: select CONFIG_POWER_SUPPLY
  HID: i2c-hid: remove i2c_hid_open_mut
  HID: wacom: Support "in range" for Intuos/Bamboo tablets where possible
  HID: core: fix hid_hw_open() comment
  HID: hid-plantronics: Re-resend Update to map button for PTT products
  HID: multitouch: fix types returned from mt_need_to_apply_feature()
  HID: i2c-hid: check if device is there before really probing
  HID: steam: add missing fields in client initialization
  HID: steam: add battery device.
  HID: add driver for Valve Steam Controller
  HID: alps: Fix some style in 't4_read_write_register()'
  HID: alps: Check errors returned by 't4_read_write_register()'
  HID: alps: Save a memory allocation in 't4_read_write_register()' when writing data
  HID: alps: Report an error if we receive invalid data in 't4_read_write_register()'
  HID: multitouch: implement precision touchpad latency and switches
  HID: multitouch: simplify the settings of the various features
  HID: multitouch: make use of HID_QUIRK_INPUT_PER_APP
  ...

18 files changed, 1621 insertions, 185 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 0000434a1fbd..a49a10437c40 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -575,6 +575,13 @@ config HID_MAYFLASH
         Say Y here if you have HJZ Mayflash PS3 game controller adapters
         and want to enable force feedback support.
 
+config HID_REDRAGON
+        tristate "Redragon keyboards"
+        depends on HID
+        default !EXPERT
+        ---help---
+    Support for Redragon keyboards that need fix-ups to work properly.
+
 config HID_MICROSOFT
         tristate "Microsoft non-fully HID-compliant devices"
         depends on HID
@@ -838,6 +845,15 @@ config HID_SPEEDLINK
         ---help---
         Support for Speedlink Vicious and Divine Cezanne mouse.
 
+config HID_STEAM
+        tristate "Steam Controller support"
+        depends on HID
+        select POWER_SUPPLY
+        ---help---
+        Say Y here if you have a Steam Controller if you want to use it
+        without running the Steam Client. It supports both the wired and
+        the wireless adaptor.
+
 config HID_STEELSERIES
         tristate "Steelseries SRW-S1 steering wheel support"
         depends on HID
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 17a8bd97da9d..511e1cbff768 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -86,6 +86,7 @@ hid-picolcd-$(CONFIG_DEBUG_FS)		+= hid-picolcd_debugfs.o
 
 obj-$(CONFIG_HID_PLANTRONICS)   += hid-plantronics.o
 obj-$(CONFIG_HID_PRIMAX)        += hid-primax.o
+obj-$(CONFIG_HID_REDRAGON)      += hid-redragon.o
 obj-$(CONFIG_HID_RETRODE)       += hid-retrode.o
 obj-$(CONFIG_HID_ROCCAT)        += hid-roccat.o hid-roccat-common.o \
         hid-roccat-arvo.o hid-roccat-isku.o hid-roccat-kone.o \
@@ -97,6 +98,7 @@ obj-$(CONFIG_HID_SAMSUNG)	+= hid-samsung.o
 obj-$(CONFIG_HID_SMARTJOYPLUS)  += hid-sjoy.o
 obj-$(CONFIG_HID_SONY)          += hid-sony.o
 obj-$(CONFIG_HID_SPEEDLINK)     += hid-speedlink.o
+obj-$(CONFIG_HID_STEAM)         += hid-steam.o
 obj-$(CONFIG_HID_STEELSERIES)   += hid-steelseries.o
 obj-$(CONFIG_HID_SUNPLUS)       += hid-sunplus.o
 obj-$(CONFIG_HID_GREENASIA)     += hid-gaff.o
diff --git a/drivers/hid/hid-alps.c b/drivers/hid/hid-alps.c
index b1eeb4839bfc..aec253b44156 100644
--- a/drivers/hid/hid-alps.c
+++ b/drivers/hid/hid-alps.c
@@ -171,7 +171,7 @@ static int t4_read_write_register(struct hid_device *hdev, u32 address,
         int ret;
         u16 check_sum;
         u8 *input;
-        u8 *readbuf;
+        u8 *readbuf = NULL;
 
         input = kzalloc(T4_FEATURE_REPORT_LEN, GFP_KERNEL);
         if (!input)
@@ -204,8 +204,8 @@ static int t4_read_write_register(struct hid_device *hdev, u32 address,
                 goto exit;
         }
 
-        readbuf = kzalloc(T4_FEATURE_REPORT_LEN, GFP_KERNEL);
         if (read_flag) {
+                readbuf = kzalloc(T4_FEATURE_REPORT_LEN, GFP_KERNEL);
                 if (!readbuf) {
                         ret = -ENOMEM;
                         goto exit;
@@ -219,22 +219,24 @@ static int t4_read_write_register(struct hid_device *hdev, u32 address,
                         goto exit_readbuf;
                 }
 
+                ret = -EINVAL;
+
                 if (*(u32 *)&readbuf[6] != address) {
                         dev_err(&hdev->dev, "read register address error (%x,%x)\n",
-                        *(u32 *)&readbuf[6], address);
+                                *(u32 *)&readbuf[6], address);
                         goto exit_readbuf;
                 }
 
                 if (*(u16 *)&readbuf[10] != 1) {
                         dev_err(&hdev->dev, "read register size error (%x)\n",
-                        *(u16 *)&readbuf[10]);
+                                *(u16 *)&readbuf[10]);
                         goto exit_readbuf;
                 }
 
                 check_sum = t4_calc_check_sum(readbuf, 6, 7);
                 if (*(u16 *)&readbuf[13] != check_sum) {
                         dev_err(&hdev->dev, "read register checksum error (%x,%x)\n",
-                        *(u16 *)&readbuf[13], check_sum);
+                                *(u16 *)&readbuf[13], check_sum);
                         goto exit_readbuf;
                 }
 
@@ -458,17 +460,35 @@ static int __maybe_unused alps_post_reset(struct hid_device *hdev)
         case T4:
                 ret = t4_read_write_register(hdev, T4_PRM_FEED_CONFIG_1,
                         NULL, T4_I2C_ABS, false);
+                if (ret < 0) {
+                        dev_err(&hdev->dev, "failed T4_PRM_FEED_CONFIG_1 (%d)\n",
+                                ret);
+                        goto exit;
+                }
+
                 ret = t4_read_write_register(hdev, T4_PRM_FEED_CONFIG_4,
                         NULL, T4_FEEDCFG4_ADVANCED_ABS_ENABLE, false);
+                if (ret < 0) {
+                        dev_err(&hdev->dev, "failed T4_PRM_FEED_CONFIG_4 (%d)\n",
+                                ret);
+                        goto exit;
+                }
                 break;
         case U1:
                 ret = u1_read_write_register(hdev,
                         ADDRESS_U1_DEV_CTRL_1, NULL,
                         U1_TP_ABS_MODE | U1_SP_ABS_MODE, false);
+                if (ret < 0) {
+                        dev_err(&hdev->dev, "failed to change TP mode (%d)\n",
+                                ret);
+                        goto exit;
+                }
                 break;
         default:
                 break;
         }
+
+exit:
         return ret;
 }
 
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 5d7cc6bbbac6..355dc7e49562 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -57,7 +57,9 @@ MODULE_PARM_DESC(ignore_special_drivers, "Ignore any special drivers and handle
  * Register a new report for a device.
  */
 
-struct hid_report *hid_register_report(struct hid_device *device, unsigned type, unsigned id)
+st