Merge branches 'for-4.2/upstream-fixes-devm-fixed' and 'for-4.3/upstream' into for-linus

6 files changed, 34 insertions, 12 deletions

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 157c62775053..b403fe2c5cbe 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -427,6 +427,7 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)
 {
         __u32 data;
         unsigned n;
+        __u32 count;
 
         data = item_udata(item);
 
@@ -490,6 +491,24 @@ static int hid_parser_local(struct hid_parser *parser, struct hid_item *item)
                 if (item->size <= 2)
                         data = (parser->global.usage_page << 16) + data;
 
+                count = data - parser->local.usage_minimum;
+                if (count + parser->local.usage_index >= HID_MAX_USAGES) {
+                        /*
+                         * We do not warn if the name is not set, we are
+                         * actually pre-scanning the device.
+                         */
+                        if (dev_name(&parser->device->dev))
+                                hid_warn(parser->device,
+                                         "ignoring exceeding usage max\n");
+                        data = HID_MAX_USAGES - parser->local.usage_index +
+                                parser->local.usage_minimum - 1;
+                        if (data <= 0) {
+                                hid_err(parser->device,
+                                        "no more usage index available\n");
+                                return -1;
+                        }
+                }
+
                 for (n = parser->local.usage_minimum; n <= data; n++)
                         if (hid_add_usage(parser, n)) {
                                 dbg_hid("hid_add_usage failed\n");
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index b04b0820d816..0de3284a3e24 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -922,7 +922,8 @@
 #define USB_DEVICE_ID_TOUCHPACK_RTS     0x1688
 
 #define USB_VENDOR_ID_TPV               0x25aa
-#define USB_DEVICE_ID_TPV_OPTICAL_TOUCHSCREEN   0x8883
+#define USB_DEVICE_ID_TPV_OPTICAL_TOUCHSCREEN_8882      0x8882
+#define USB_DEVICE_ID_TPV_OPTICAL_TOUCHSCREEN_8883      0x8883
 
 #define USB_VENDOR_ID_TURBOX            0x062a
 #define USB_DEVICE_ID_TURBOX_KEYBOARD   0x0201
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index e3c63640df73..53aeaf6252c7 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -1166,8 +1166,11 @@ void hidinput_hid_event(struct hid_device *hid, struct hid_field *field, struct
 
         input_event(input, usage->type, usage->code, value);
 
-        if ((field->flags & HID_MAIN_ITEM_RELATIVE) && (usage->type == EV_KEY))
+        if ((field->flags & HID_MAIN_ITEM_RELATIVE) &&
+            usage->type == EV_KEY && value) {
+                input_sync(input);
                 input_event(input, usage->type, usage->code, 0);
+        }
 }
 
 void hidinput_report_event(struct hid_device *hid, struct hid_report *report)
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index bfbe1bedda7f..36712e9f56c2 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -164,7 +164,7 @@ static void hid_io_error(struct hid_device *hid)
         if (time_after(jiffies, usbhid->stop_retry)) {
 
                 /* Retries failed, so do a port reset unless we lack bandwidth*/
-                if (test_bit(HID_NO_BANDWIDTH, &usbhid->iofl)
+                if (!test_bit(HID_NO_BANDWIDTH, &usbhid->iofl)
                      && !test_and_set_bit(HID_RESET_PENDING, &usbhid->iofl)) {
 
                         schedule_work(&usbhid->reset_work);
@@ -710,7 +710,8 @@ int usbhid_open(struct hid_device *hid)
                  * Wait 50 msec for the queue to empty before allowing events
                  * to go through hid.
                  */
-                msleep(50);
+                if (res == 0 && !(hid->quirks & HID_QUIRK_ALWAYS_POLL))
+                        msleep(50);
                 clear_bit(HID_RESUME_RUNNING, &usbhid->iofl);
         }
 done:
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 20f9a653444c..965432e413c6 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -117,7 +117,8 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_1, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_SYMBOL, USB_DEVICE_ID_SYMBOL_SCANNER_2, HID_QUIRK_NOGET },
-        { USB_VENDOR_ID_TPV, USB_DEVICE_ID_TPV_OPTICAL_TOUCHSCREEN, HID_QUIRK_NOGET },
+        { USB_VENDOR_ID_TPV, USB_DEVICE_ID_TPV_OPTICAL_TOUCHSCREEN_8882, HID_QUIRK_NOGET },
+        { USB_VENDOR_ID_TPV, USB_DEVICE_ID_TPV_OPTICAL_TOUCHSCREEN_8883, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_KNA5, HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_TWA60, HID_QUIRK_MULTI_INPUT },
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 01b937e63cf3..5cdb04472023 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -335,7 +335,7 @@ static int wacom_set_device_mode(struct hid_device *hdev, int report_id,
                 if (error >= 0)
                         error = wacom_get_report(hdev, HID_FEATURE_REPORT,
                                                  rep_data, length, 1);
-        } while ((error < 0 || rep_data[1] != mode) && limit++ < WAC_MSG_RETRIES);
+        } while (error >= 0 && rep_data[1] != mode && limit++ < WAC_MSG_RETRIES);
 
         kfree(rep_data);
 
@@ -1149,12 +1149,9 @@ static void wacom_free_inputs(struct wacom *wacom)
 {
         struct wacom_wac *wacom_wac = &(wacom->wacom_wac);
 
-        if (wacom_wac->pen_input)
-                input_free_device(wacom_wac->pen_input);
-        if (wacom_wac->touch_input)
-                input_free_device(wacom_wac->touch_input);
-        if (wacom_wac->pad_input)
-                input_free_device(wacom_wac->pad_input);
+        input_free_device(wacom_wac->pen_input);
+        input_free_device(wacom_wac->touch_input);
+        input_free_device(wacom_wac->pad_input);
         wacom_wac->pen_input = NULL;
         wacom_wac->touch_input = NULL;
         wacom_wac->pad_input = NULL;