summaryrefslogtreecommitdiffstats
path: root/drivers/hid/wacom_wac.h
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>2014-07-26 02:31:51 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-07-26 03:55:53 +0200
commitd70420b914c98a3758674c6e9858810e0ab4ea30 (patch)
tree7ac23e36fd6f69d3450b9a875f12e3a8b0c10943 /drivers/hid/wacom_wac.h
parentInput: wacom - enhance Wireless Receiver battery reporting (diff)
downloadlinux-d70420b914c98a3758674c6e9858810e0ab4ea30.tar.xz
linux-d70420b914c98a3758674c6e9858810e0ab4ea30.zip
Input: wacom - use a uniq name for the battery device
The current implementation uses "wacom_battery" as a generic name for batteries. This prevents us to have two Wacom devices with a battery attached as the power system will complain about the name which is already registered. Use an incremental name for each battery attached. Related bug: https://sourceforge.net/p/linuxwacom/bugs/248/ Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Acked-by: Przemo Firszt <przemo@firszt.eu> Acked-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/hid/wacom_wac.h')
-rw-r--r--drivers/hid/wacom_wac.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h
index 8a042ac0114e..6cdf707821cd 100644
--- a/drivers/hid/wacom_wac.h
+++ b/drivers/hid/wacom_wac.h
@@ -154,6 +154,7 @@ struct wacom_shared {
struct wacom_wac {
char name[WACOM_NAME_MAX];
char pad_name[WACOM_NAME_MAX];
+ char bat_name[WACOM_NAME_MAX];
unsigned char data[WACOM_PKGLEN_MAX];
int tool[2];
int id[2];