diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2014-07-26 00:31:51 (GMT) |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-07-26 01:55:53 (GMT) |
| commit | d70420b914c98a3758674c6e9858810e0ab4ea30 (patch) | |
| tree | 7ac23e36fd6f69d3450b9a875f12e3a8b0c10943 /drivers/hid/wacom_sys.c | |
| parent | ac8d10101b0e3a0a1478f8bb51bbbb0a56fe0956 (diff) | |
| download | linux-d70420b914c98a3758674c6e9858810e0ab4ea30.tar.xz | |
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_sys.c')
| -rw-r--r-- | drivers/hid/wacom_sys.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index f8744c4..a27404d 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -809,12 +809,16 @@ static int wacom_battery_get_property(struct power_supply *psy, static int wacom_initialize_battery(struct wacom *wacom) { int error = 0; + static atomic_t battery_no = ATOMIC_INIT(0); + unsigned long n; if (wacom->wacom_wac.features.quirks & WACOM_QUIRK_BATTERY) { + n = atomic_inc_return(&battery_no) - 1; wacom->battery.properties = wacom_battery_props; wacom->battery.num_properties = ARRAY_SIZE(wacom_battery_props); wacom->battery.get_property = wacom_battery_get_property; - wacom->battery.name = "wacom_battery"; + sprintf(wacom->wacom_wac.bat_name, "wacom_battery_%ld", n); + wacom->battery.name = wacom->wacom_wac.bat_name; wacom->battery.type = POWER_SUPPLY_TYPE_BATTERY; wacom->battery.use_for_apm = 0; |