From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 10 Aug 2015 08:49:38 +0000 (+0200)
Subject: Merge branch 'for-4.3/wacom' into for-next
X-Git-Tag: KARO-TX6UL-2015-11-03~102^2~28
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=13ea92985c2936c70e294a7a259b4cac5bc74664;hp=-c;p=karo-tx-linux.git

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

13ea92985c2936c70e294a7a259b4cac5bc74664
diff --combined drivers/hid/wacom_sys.c
index 0c3c56776081,6edb7d136476..7c785b027d0b
--- a/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: