Merge branches 'for-4.3/chicony', 'for-4.3/cp2112', 'for-4.3/i2c-hid', 'for-4.3/lenov...

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/hid/hid-multitouch.c
Simple merge

diff --cc drivers/hid/wacom_sys.c
index 5cdb044720231e0e32a1f2eb79cacfaefe95c4ce,44958d79d598dfc3a7e6938a2babbf3e1fdc2188,44958d79d598dfc3a7e6938a2babbf3e1fdc2188,4c0ffca97befd61cf3cdd947138d14070c4e7895,01b937e63cf37ec1424a1aad9eee0caef682c010,44958d79d598dfc3a7e6938a2babbf3e1fdc2188,4c0ffca97befd61cf3cdd947138d14070c4e7895,4c0ffca97befd61cf3cdd947138d14070c4e7895,4c0ffca97befd61cf3cdd947138d14070c4e7895,4c0ffca97befd61cf3cdd947138d14070c4e7895,4c0ffca97befd61cf3cdd947138d14070c4e7895,5f6e48e55df9b0ad305a934890e895408417d758..9a4912c1828dad3109b9473305670c79fc20d022
--- 1/drivers/hid/wacom_sys.c
--- 2/drivers/hid/wacom_sys.c
--- 3/drivers/hid/wacom_sys.c
--- 4/drivers/hid/wacom_sys.c
--- 5/drivers/hid/wacom_sys.c
--- 6/drivers/hid/wacom_sys.c
--- 7/drivers/hid/wacom_sys.c
--- 8/drivers/hid/wacom_sys.c
--- 9/drivers/hid/wacom_sys.c
--- 10/drivers/hid/wacom_sys.c
--- 11/drivers/hid/wacom_sys.c
--- 12/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) {

diff --cc drivers/hid/wacom_wac.c
Simple merge