Skip to contentSkip to conversation

HID: wacom - PAD is independent with pen/touch

PATCH Applied Ping Cheng 2 participants 6 messages Nov 21, 2014 – Nov 26, 2014

Subsystems (2)
lore
Share & tools
lore

Ping Cheng

author
#0 lore raw

PATCH 1/1 HID: wacom - PAD is independent with pen/touch

PAD can be on pen interface (Intuos Pro and Cintiq series) or touch interface (Bamboo PT and Intuos PT series) or its own interface (Bamboo pen-only and Intuos Pen M/S). We need to mark it independently.

---
 drivers/hid/wacom_sys.c | 8 +++++---
 drivers/hid/wacom_wac.h | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/hid/wacom_sys.c +5 -3
index 68b6cd6..eb55316 100644
@@ -1135,7 +1135,7 @@ static void wacom_clean_inputs(struct wacom *wacom)
 			input_free_device(wacom->wacom_wac.input);
 	}
 	if (wacom->wacom_wac.pad_input) {
-		if (wacom->wacom_wac.input_registered)
+		if (wacom->wacom_wac.pad_registered)
 			input_unregister_device(wacom->wacom_wac.pad_input);
 		else
 			input_free_device(wacom->wacom_wac.pad_input);
@@ -1162,6 +1162,7 @@ static int wacom_register_inputs(struct wacom *wacom)
 		error = input_register_device(input_dev);
 		if (error)
 			return error;
+		wacom_wac->input_registered = true;
 	}
 
 	error = wacom_setup_pad_input_capabilities(pad_input_dev, wacom_wac);
@@ -1174,22 +1175,23 @@ static int wacom_register_inputs(struct wacom *wacom)
 		error = input_register_device(pad_input_dev);
 		if (error)
 			goto fail_register_pad_input;
+		wacom_wac->pad_registered = true;
 
 		error = wacom_initialize_leds(wacom);
 		if (error)
 			goto fail_leds;
 	}
 
-	wacom_wac->input_registered = true;
-
 	return 0;
 
 fail_leds:
 	input_unregister_device(pad_input_dev);
 	pad_input_dev = NULL;
+	wacom_wac->pad_registered = false;
 fail_register_pad_input:
 	input_unregister_device(input_dev);
 	wacom_wac->input = NULL;
+	wacom_wac->input_registered = false;
 	return error;
 }
 
drivers/hid/wacom_wac.h +1 -0
index 0f0b85e..128cbb3 100644
@@ -183,6 +183,7 @@ struct wacom_wac {
 	struct input_dev *input;
 	struct input_dev *pad_input;
 	bool input_registered;
+	bool pad_registered;
 	int pid;
 	int battery_capacity;
 	int num_contacts_left;
Signature · 1 line
1.9.1
author
#1 lore raw

Hi Jiri,

Please don't forget to merge this patch. It fixes a bad pointer issue...

Thanks,

Ping

Quoted 73 lines · Ping Cheng

PAD can be on pen interface (Intuos Pro and Cintiq series) or touch interface (Bamboo PT and Intuos PT series) or its own interface (Bamboo pen-only and Intuos Pen M/S). We need to mark it independently.

---
 drivers/hid/wacom_sys.c | 8 +++++---
 drivers/hid/wacom_wac.h | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/hid/wacom_sys.c +5 -3
index 68b6cd6..eb55316 100644
@@ -1135,7 +1135,7 @@ static void wacom_clean_inputs(struct wacom *wacom)
                        input_free_device(wacom->wacom_wac.input);
        }
        if (wacom->wacom_wac.pad_input) {
-               if (wacom->wacom_wac.input_registered)
+               if (wacom->wacom_wac.pad_registered)
                        input_unregister_device(wacom->wacom_wac.pad_input);
                else
                        input_free_device(wacom->wacom_wac.pad_input);
@@ -1162,6 +1162,7 @@ static int wacom_register_inputs(struct wacom *wacom)
                error = input_register_device(input_dev);
                if (error)
                        return error;
+               wacom_wac->input_registered = true;
        }
 
        error = wacom_setup_pad_input_capabilities(pad_input_dev, wacom_wac);
@@ -1174,22 +1175,23 @@ static int wacom_register_inputs(struct wacom *wacom)
                error = input_register_device(pad_input_dev);
                if (error)
                        goto fail_register_pad_input;
+               wacom_wac->pad_registered = true;
 
                error = wacom_initialize_leds(wacom);
                if (error)
                        goto fail_leds;
        }
 
-       wacom_wac->input_registered = true;
-
        return 0;
 
 fail_leds:
        input_unregister_device(pad_input_dev);
        pad_input_dev = NULL;
+       wacom_wac->pad_registered = false;
 fail_register_pad_input:
        input_unregister_device(input_dev);
        wacom_wac->input = NULL;
+       wacom_wac->input_registered = false;
        return error;
 }
 
drivers/hid/wacom_wac.h +1 -1
index 0f0b85e..128cbb3 100644
@@ -183,6 +183,7 @@ struct wacom_wac {
        struct input_dev *input;
        struct input_dev *pad_input;
        bool input_registered;
+       bool pad_registered;
        int pid;
        int battery_capacity;
        int num_contacts_left;
--

1.9.1

#2 lore raw
Quoted 1 line · Ping Cheng

Please don't forget to merge this patch. It fixes a bad pointer issue...

Hi Ping,

yes, it's in my queue for this evening or tomorrow.

I will also add Cc: stable, ok?

Thanks,

Signature · 2 lines
Jiri Kosina
SUSE Labs
author
#3 lore raw
Quoted 7 lines · Jiri Kosina
Quoted 1 line · Ping Cheng

Please don't forget to merge this patch. It fixes a bad pointer issue...

Hi Ping,

yes, it's in my queue for this evening or tomorrow.

Thank you.

Quoted 1 line

I will also add Cc: stable, ok?

If you Cc this one to stable, please also include my other three patches, dated Nov. 18, 2014, under your wacom-3.19 branch. Those four patches go together to fix a system freeze issue caused by Bamboo Pen only device.

Cheers,

Ping

#4 lore raw
Quoted 6 lines · Ping Cheng
Quoted 1 line

I will also add Cc: stable, ok?

If you Cc this one to stable, please also include my other three patches, dated Nov. 18, 2014, under your wacom-3.19 branch. Those four patches go together to fix a system freeze issue caused by Bamboo Pen only device.

Gah, I was sure I did, but looking at the tree, I didn't. Thanks for pointing that out, I will sort it out.

Signature · 2 lines
Jiri Kosina
SUSE Labs