From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 1 Sep 2015 13:37:30 +0000 (+0200)
Subject: Merge branches 'for-4.3/chicony', 'for-4.3/cp2112', 'for-4.3/i2c-hid', 'for-4.3/lenov... 
X-Git-Tag: drm-fsl-dcu-for-next~2618^2~1
X-Git-Url: http://git.agner.ch/gitweb/?p=linux-drm-fsl-dcu.git;a=commitdiff_plain;h=8c4de9bc2041229fb778e0c47e32585b6f6b1d09

Merge branches 'for-4.3/chicony', 'for-4.3/cp2112', 'for-4.3/i2c-hid', 'for-4.3/lenovo', 'for-4.3/logitech', 'for-4.3/multitouch', 'for-4.3/picolcd', 'for-4.3/rmi', 'for-4.3/sensor-hub', 'for-4.3/sony' and 'for-4.3/wacom' into for-linus
---

8c4de9bc2041229fb778e0c47e32585b6f6b1d09
diff --cc drivers/hid/wacom_sys.c
index 5cdb04472023,44958d79d598,44958d79d598,4c0ffca97bef,01b937e63cf3,44958d79d598,4c0ffca97bef,4c0ffca97bef,4c0ffca97bef,4c0ffca97bef,4c0ffca97bef,5f6e48e55df9..9a4912c1828d
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@@@@@@@@@@@@ -1145,40 -1145,43 -1145,43 -1145,43 -1145,43 -1145,43 -1145,43 -1145,43 -1145,43 -1145,43 -1145,43 -1331,6 +1331,6 @@@@@@@@@@@@@ static struct input_dev *wacom_allocate
            	return input_dev;
            }
            
----------- static void wacom_free_inputs(struct wacom *wacom)
----------- {
----------- 	struct wacom_wac *wacom_wac = &(wacom->wacom_wac);
----------- 
-           	input_free_device(wacom_wac->pen_input);
-           	input_free_device(wacom_wac->touch_input);
-           	input_free_device(wacom_wac->pad_input);
 ---------- 	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);
----------- 	wacom_wac->pen_input = NULL;
----------- 	wacom_wac->touch_input = NULL;
----------- 	wacom_wac->pad_input = NULL;
----------- }
----------- 
----------- static int wacom_allocate_inputs(struct wacom *wacom)
----------- {
----------- 	struct input_dev *pen_input_dev, *touch_input_dev, *pad_input_dev;
----------- 	struct wacom_wac *wacom_wac = &(wacom->wacom_wac);
----------- 
----------- 	pen_input_dev = wacom_allocate_input(wacom);
----------- 	touch_input_dev = wacom_allocate_input(wacom);
----------- 	pad_input_dev = wacom_allocate_input(wacom);
----------- 	if (!pen_input_dev || !touch_input_dev || !pad_input_dev) {
----------- 		wacom_free_inputs(wacom);
----------- 		return -ENOMEM;
----------- 	}
----------- 
----------- 	wacom_wac->pen_input = pen_input_dev;
----------- 	wacom_wac->touch_input = touch_input_dev;
----------- 	wacom_wac->touch_input->name = wacom_wac->touch_name;
----------- 	wacom_wac->pad_input = pad_input_dev;
----------- 	wacom_wac->pad_input->name = wacom_wac->pad_name;
----------- 
----------- 	return 0;
----------- }
----------- 
            static void wacom_clean_inputs(struct wacom *wacom)
            {
            	if (wacom->wacom_wac.pen_input) {