From: Chris Bagwell <ch...@cnpbagwell.com>
For graphire, the ABS_MISC was never sending any information
beyond what BTN_TOOL_* was providing. So remove sending
event.
Bamboo P&T and a left over send for the pen tool even though
capability wasn't declared. So remove as well.
Signed-off-by: Chris Bagwell <ch...@cnpbagwell.com>
---
drivers/input/tablet/wacom_wac.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index 6c3ff00..7b69a21 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -263,7 +263,6 @@ static int wacom_graphire_irq(struct wacom_wac *wacom)
if (!prox)
wacom->id[0] = 0;
- input_report_abs(input, ABS_MISC, wacom->id[0]); /* report tool
id */
input_report_key(input, wacom->tool[0], prox);
input_sync(input); /* sync last event */
}
@@ -280,7 +279,6 @@ static int wacom_graphire_irq(struct wacom_wac *wacom)
input_report_rel(input, REL_WHEEL, rw);
if (!prox)
wacom->id[1] = 0;
- input_report_abs(input, ABS_MISC, wacom->id[1]);
retval = 1;
}
break;
@@ -296,7 +294,6 @@ static int wacom_graphire_irq(struct wacom_wac *wacom)
input_report_abs(input, ABS_WHEEL, (data[8] & 0x7f));
if (!prox)
wacom->id[1] = 0;
- input_report_abs(input, ABS_MISC, wacom->id[1]);
retval = 1;
}
break;
@@ -962,7 +959,6 @@ static int wacom_bpt_pen(struct wacom_wac *wacom)
}
input_report_key(input, wacom->tool[0], prox); /* PEN or RUBBER */
- input_report_abs(input, ABS_MISC, wacom->id[0]); /* TOOL ID */
return 1;
}
@@ -1154,6 +1150,8 @@ void wacom_setup_input_capabilities(struct input_dev
*input_dev,
/* fall through */
case GRAPHIRE:
+ __clear_bit(ABS_MISC, input_dev->absbit);
+
input_set_capability(input_dev, EV_REL, REL_WHEEL);
__set_bit(BTN_LEFT, input_dev->keybit);
--
1.7.7.3
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
