diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2014-07-24 22:16:17 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-07-26 03:55:52 +0200 |
| commit | c757cbafd6afe8e47d12320aa05edcd1b1d97186 (patch) | |
| tree | ee5f29d13f2d0d4c9a2c787c3af446e1dbc2902d /drivers/hid | |
| parent | Input: wacom - support up to 2048 pressure levels with ISDv4 (diff) | |
| download | linux-c757cbafd6afe8e47d12320aa05edcd1b1d97186.tar.xz linux-c757cbafd6afe8e47d12320aa05edcd1b1d97186.zip | |
Input: wacom - put a flag when the led are initialized
This solves a bug with the wireless receiver:
- at plug, the wireless receiver does not know which Wacom device it is
connected to, so it does not actually creates all the LEDs
- when the tablet connects, wacom->wacom_wac.features.type is set to the
proper device so that wacom_wac can understand the packets
- when the receiver is unplugged, it detects that a LED should have been
created (based on wacom->wacom_wac.features.type) and tries to remove
it: crash when removing the sysfs group.
Side effect, we can now safely call several times wacom_destroy_leds().
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/wacom.h | 1 | ||||
| -rw-r--r-- | drivers/hid/wacom_sys.c | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/hid/wacom.h b/drivers/hid/wacom.h index dd67b7da8a97..a678f827e39e 100644 --- a/drivers/hid/wacom.h +++ b/drivers/hid/wacom.h @@ -118,6 +118,7 @@ struct wacom { u8 hlv; /* status led brightness button pressed (1..127) */ u8 img_lum; /* OLED matrix display brightness */ } led; + bool led_initialized; struct power_supply battery; }; diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 06e304b3bbfd..f1c6d3dae248 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -729,12 +729,18 @@ static int wacom_initialize_leds(struct wacom *wacom) return error; } wacom_led_control(wacom); + wacom->led_initialized = true; return 0; } static void wacom_destroy_leds(struct wacom *wacom) { + if (!wacom->led_initialized) + return; + + wacom->led_initialized = false; + switch (wacom->wacom_wac.features.type) { case INTUOS4S: case INTUOS4: |