Merge tag 'v4.6-rc6' into x86/asm, to refresh the tree

Signed-off-by: Ingo Molnar <mingo@kernel.org>

6 files changed, 16 insertions, 13 deletions

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index e8a84d12b7ff..1142a93dd90b 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -153,6 +153,7 @@ static const struct xpad_device {
         { 0x0738, 0x4728, "Mad Catz Street Fighter IV FightPad", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
         { 0x0738, 0x4738, "Mad Catz Wired Xbox 360 Controller (SFIV)", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 },
         { 0x0738, 0x4740, "Mad Catz Beat Pad", 0, XTYPE_XBOX360 },
+        { 0x0738, 0x4a01, "Mad Catz FightStick TE 2", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE },
         { 0x0738, 0x6040, "Mad Catz Beat Pad Pro", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
         { 0x0738, 0xb726, "Mad Catz Xbox controller - MW2", 0, XTYPE_XBOX360 },
         { 0x0738, 0xbeef, "Mad Catz JOYTECH NEO SE Advanced GamePad", XTYPE_XBOX360 },
@@ -304,6 +305,7 @@ static struct usb_device_id xpad_table[] = {
         XPAD_XBOX360_VENDOR(0x046d),            /* Logitech X-Box 360 style controllers */
         XPAD_XBOX360_VENDOR(0x0738),            /* Mad Catz X-Box 360 controllers */
         { USB_DEVICE(0x0738, 0x4540) },         /* Mad Catz Beat Pad */
+        XPAD_XBOXONE_VENDOR(0x0738),            /* Mad Catz FightStick TE 2 */
         XPAD_XBOX360_VENDOR(0x0e6f),            /* 0x0e6f X-Box 360 controllers */
         XPAD_XBOX360_VENDOR(0x12ab),            /* X-Box 360 dance pads */
         XPAD_XBOX360_VENDOR(0x1430),            /* RedOctane X-Box 360 controllers */
diff --git a/drivers/input/misc/arizona-haptics.c b/drivers/input/misc/arizona-haptics.c
index d5994a745ffa..982936334537 100644
--- a/drivers/input/misc/arizona-haptics.c
+++ b/drivers/input/misc/arizona-haptics.c
@@ -178,7 +178,6 @@ static int arizona_haptics_probe(struct platform_device *pdev)
         input_set_drvdata(haptics->input_dev, haptics);
 
         haptics->input_dev->name = "arizona:haptics";
-        haptics->input_dev->dev.parent = pdev->dev.parent;
         haptics->input_dev->close = arizona_haptics_close;
         __set_bit(FF_RUMBLE, haptics->input_dev->ffbit);
 
diff --git a/drivers/input/misc/pmic8xxx-pwrkey.c b/drivers/input/misc/pmic8xxx-pwrkey.c
index 3f02e0e03d12..67aab86048ad 100644
--- a/drivers/input/misc/pmic8xxx-pwrkey.c
+++ b/drivers/input/misc/pmic8xxx-pwrkey.c
@@ -353,7 +353,8 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev)
         if (of_property_read_u32(pdev->dev.of_node, "debounce", &kpd_delay))
                 kpd_delay = 15625;
 
-        if (kpd_delay > 62500 || kpd_delay == 0) {
+        /* Valid range of pwr key trigger delay is 1/64 sec to 2 seconds. */
+        if (kpd_delay > USEC_PER_SEC * 2 || kpd_delay < USEC_PER_SEC / 64) {
                 dev_err(&pdev->dev, "invalid power key trigger delay\n");
                 return -EINVAL;
         }
@@ -385,8 +386,8 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev)
         pwr->name = "pmic8xxx_pwrkey";
         pwr->phys = "pmic8xxx_pwrkey/input0";
 
-        delay = (kpd_delay << 10) / USEC_PER_SEC;
-        delay = 1 + ilog2(delay);
+        delay = (kpd_delay << 6) / USEC_PER_SEC;
+        delay = ilog2(delay);
 
         err = regmap_read(regmap, PON_CNTL_1, &pon_cntl);
         if (err < 0) {
diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c
index 10c4e3d462f1..caa5a62c42fb 100644
--- a/drivers/input/misc/twl4030-vibra.c
+++ b/drivers/input/misc/twl4030-vibra.c
@@ -222,7 +222,6 @@ static int twl4030_vibra_probe(struct platform_device *pdev)
 
         info->input_dev->name = "twl4030:vibrator";
         info->input_dev->id.version = 1;
-        info->input_dev->dev.parent = pdev->dev.parent;
         info->input_dev->close = twl4030_vibra_close;
         __set_bit(FF_RUMBLE, info->input_dev->ffbit);
 
diff --git a/drivers/input/misc/twl6040-vibra.c b/drivers/input/misc/twl6040-vibra.c
index ea63fad48de6..53e33fab3f7a 100644
--- a/drivers/input/misc/twl6040-vibra.c
+++ b/drivers/input/misc/twl6040-vibra.c
@@ -45,7 +45,6 @@
 struct vibra_info {
         struct device *dev;
         struct input_dev *input_dev;
-        struct workqueue_struct *workqueue;
         struct work_struct play_work;
         struct mutex mutex;
         int irq;
@@ -213,11 +212,7 @@ static int vibra_play(struct input_dev *input, void *data,
         info->strong_speed = effect->u.rumble.strong_magnitude;
         info->direction = effect->direction < EFFECT_DIR_180_DEG ? 1 : -1;
 
-        ret = queue_work(info->workqueue, &info->play_work);
-        if (!ret) {
-                dev_info(&input->dev, "work is already on queue\n");
-                return ret;
-        }
+        schedule_work(&info->play_work);
 
         return 0;
 }
@@ -362,7 +357,6 @@ static int twl6040_vibra_probe(struct platform_device *pdev)
 
         info->input_dev->name = "twl6040:vibrator";
         info->input_dev->id.version = 1;
-        info->input_dev->dev.parent = pdev->dev.parent;
         info->input_dev->close = twl6040_vibra_close;
         __set_bit(FF_RUMBLE, info->input_dev->ffbit);
 
diff --git a/drivers/input/tablet/gtco.c b/drivers/input/tablet/gtco.c
index 3a7f3a4a4396..7c18249d6c8e 100644
--- a/drivers/input/tablet/gtco.c
+++ b/drivers/input/tablet/gtco.c
@@ -858,6 +858,14 @@ static int gtco_probe(struct usb_interface *usbinterface,
                 goto err_free_buf;
         }
 
+        /* Sanity check that a device has an endpoint */
+        if (usbinterface->altsetting[0].desc.bNumEndpoints < 1) {
+                dev_err(&usbinterface->dev,
+                        "Invalid number of endpoints\n");
+                error = -EINVAL;
+                goto err_free_urb;
+        }
+
         /*
          * The endpoint is always altsetting 0, we know this since we know
          * this device only has one interrupt endpoint
@@ -879,7 +887,7 @@ static int gtco_probe(struct usb_interface *usbinterface,
          * HID report descriptor
          */
         if (usb_get_extra_descriptor(usbinterface->cur_altsetting,
-                                     HID_DEVICE_TYPE, &hid_desc) != 0){
+                                     HID_DEVICE_TYPE, &hid_desc) != 0) {
                 dev_err(&usbinterface->dev,
                         "Can't retrieve exta USB descriptor to get hid report descriptor length\n");
                 error = -EIO;