Merge branch 'for-4.3/wacom' into for-next

diff --combined drivers/hid/wacom_sys.c
index 0c3c5677608110ff10ddedd142ecdc28764a6101,6edb7d1364762002af86355126d4de5ea8d65ab8..7c785b027d0bbd53eed9c13b523e6625094a5aaf
--- 1/drivers/hid/wacom_sys.c
--- 2/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@@ -335,7 -335,7 +335,7 @@@ static int wacom_set_device_mode(struc
                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);
  
@@@ -1252,13 -1252,11 +1252,13 @@@ fail_leds
        pad_input_dev = NULL;
        wacom_wac->pad_registered = false;
  fail_register_pad_input:
 -      input_unregister_device(touch_input_dev);
 +      if (touch_input_dev)
 +              input_unregister_device(touch_input_dev);
        wacom_wac->touch_input = NULL;
        wacom_wac->touch_registered = false;
  fail_register_touch_input:
 -      input_unregister_device(pen_input_dev);
 +      if (pen_input_dev)
 +              input_unregister_device(pen_input_dev);
        wacom_wac->pen_input = NULL;
        wacom_wac->pen_registered = false;
  fail_register_pen_input: