7 files changed, 20 insertions, 9 deletions

diff --git a/drivers/hid/hid-hyperv.c b/drivers/hid/hid-hyperv.c
index 0c33ae9cf0f0..406632472c1b 100644
--- a/drivers/hid/hid-hyperv.c
+++ b/drivers/hid/hid-hyperv.c
@@ -548,6 +548,7 @@ static int mousevsc_remove(struct hv_device *dev)
         struct mousevsc_dev *input_dev = hv_get_drvdata(dev);
 
         vmbus_close(dev->channel);
+        hid_hw_stop(input_dev->hid_device);
         hid_destroy_device(input_dev->hid_device);
         mousevsc_free_device(input_dev);
 
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index e1c4535c7c01..ea1c6177f18f 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -59,6 +59,9 @@
 #define USB_VENDOR_ID_AIRCABLE          0x16CA
 #define USB_DEVICE_ID_AIRCABLE1         0x1502
 
+#define USB_VENDOR_ID_AIREN             0x1a2c
+#define USB_DEVICE_ID_AIREN_SLIMPLUS    0x0002
+
 #define USB_VENDOR_ID_ALCOR             0x058f
 #define USB_DEVICE_ID_ALCOR_USBRS232    0x9720
 
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 9333d692a786..627850a54d34 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -986,8 +986,13 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
                 return;
         }
 
-        /* Ignore out-of-range values as per HID specification, section 5.10 */
-        if (value < field->logical_minimum || value > field->logical_maximum) {
+        /*
+         * Ignore out-of-range values as per HID specification,
+         * section 5.10 and 6.2.25
+         */
+        if ((field->flags & HID_MAIN_ITEM_VARIABLE) &&
+            (value < field->logical_minimum ||
+             value > field->logical_maximum)) {
                 dbg_hid("Ignoring out-of-range value %x\n", value);
                 return;
         }
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index b47e58b52d9f..acab74cde727 100644
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -531,7 +531,6 @@ static int wacom_probe(struct hid_device *hdev,
         wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY;
         wdata->battery.use_for_apm = 0;
 
-        power_supply_powers(&wdata->battery, &hdev->dev);
 
         ret = power_supply_register(&hdev->dev, &wdata->battery);
         if (ret) {
@@ -540,6 +539,8 @@ static int wacom_probe(struct hid_device *hdev,
                 goto err_battery;
         }
 
+        power_supply_powers(&wdata->battery, &hdev->dev);
+
         wdata->ac.properties = wacom_ac_props;
         wdata->ac.num_properties = ARRAY_SIZE(wacom_ac_props);
         wdata->ac.get_property = wacom_ac_get_property;
@@ -547,14 +548,14 @@ static int wacom_probe(struct hid_device *hdev,
         wdata->ac.type = POWER_SUPPLY_TYPE_MAINS;
         wdata->ac.use_for_apm = 0;
 
-        power_supply_powers(&wdata->battery, &hdev->dev);
-
         ret = power_supply_register(&hdev->dev, &wdata->ac);
         if (ret) {
                 hid_warn(hdev,
                          "can't create ac battery attribute, err: %d\n", ret);
                 goto err_ac;
         }
+
+        power_supply_powers(&wdata->ac, &hdev->dev);
 #endif
         return 0;
 
diff --git a/drivers/hid/hid-wiimote-core.c b/drivers/hid/hid-wiimote-core.c
index fc253b472f9d..cac3589b1ed5 100644
--- a/drivers/hid/hid-wiimote-core.c
+++ b/drivers/hid/hid-wiimote-core.c
@@ -1226,14 +1226,14 @@ static int wiimote_hid_probe(struct hid_device *hdev,
         wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY;
         wdata->battery.use_for_apm = 0;
 
-        power_supply_powers(&wdata->battery, &hdev->dev);
-
         ret = power_supply_register(&wdata->hdev->dev, &wdata->battery);
         if (ret) {
                 hid_err(hdev, "Cannot register battery device\n");
                 goto err_battery;
         }
 
+        power_supply_powers(&wdata->battery, &hdev->dev);
+
         ret = wiimote_leds_create(wdata);
         if (ret)
                 goto err_free;
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index c831af937481..57d4e1e1df48 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -54,6 +54,7 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_PLAYDOTCOM, USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII, HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_TOUCHPACK, USB_DEVICE_ID_TOUCHPACK_RTS, HID_QUIRK_MULTI_INPUT },
 
+        { USB_VENDOR_ID_AIREN, USB_DEVICE_ID_AIREN_SLIMPLUS, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_UC100KM, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_CS124U, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET },
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index 7c297d305d5d..b1ec0e2aeb57 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -922,11 +922,11 @@ void hiddev_disconnect(struct hid_device *hid)
         struct hiddev *hiddev = hid->hiddev;
         struct usbhid_device *usbhid = hid->driver_data;
 
+        usb_deregister_dev(usbhid->intf, &hiddev_class);
+
         mutex_lock(&hiddev->existancelock);
         hiddev->exist = 0;
 
-        usb_deregister_dev(usbhid->intf, &hiddev_class);
-
         if (hiddev->open) {
                 mutex_unlock(&hiddev->existancelock);
                 usbhid_close(hiddev->hid);