From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Jiri Kosina <jkosina@suse.cz>, Ping Cheng <pinglinux@gmail.com>,
Jason Gerecke <killertofu@gmail.com>,
Przemo Firszt <przemo@firszt.eu>
Cc: linux-kernel@vger.kernel.org, linux-input@vger.kernel.org
Subject: [PATCH v2 02/10] Input - wacom: put a flag when the led are initialized
Date: Thu, 24 Jul 2014 14:13:57 -0400 [thread overview]
Message-ID: <1406225645-32141-3-git-send-email-benjamin.tissoires@redhat.com> (raw)
In-Reply-To: <1406225645-32141-1-git-send-email-benjamin.tissoires@redhat.com>
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>
---
no changes in v2
drivers/hid/wacom.h | 1 +
drivers/hid/wacom_sys.c | 6 ++++++
2 files changed, 7 insertions(+)
diff --git a/drivers/hid/wacom.h b/drivers/hid/wacom.h
index dd67b7d..a678f82 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 9dbb6dd..c857b3d 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:
--
2.0.1
next prev parent reply other threads:[~2014-07-24 18:13 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-24 18:13 [PATCH v2 00/10] Input - wacom: conversion to HID driver, series 2 Benjamin Tissoires
2014-07-24 18:13 ` [PATCH v2 01/10] Input - wacom: Support up to 2048 pressure levels with ISDv4 Benjamin Tissoires
2014-07-24 18:13 ` Benjamin Tissoires [this message]
2014-07-24 18:13 ` [PATCH v2 03/10] Input - wacom: enhance Wireless Receiver battery reporting Benjamin Tissoires
2014-07-24 18:13 ` [PATCH v2 04/10] Input - wacom: use a uniq name for the battery device Benjamin Tissoires
2014-07-24 18:14 ` [PATCH v2 05/10] Input - wacom: register an ac power supply for wireless devices Benjamin Tissoires
2014-07-24 18:14 ` [PATCH v2 06/10] Input - wacom: prepare the driver to include BT devices Benjamin Tissoires
2014-07-26 0:39 ` Dmitry Torokhov
2014-07-26 3:25 ` Benjamin Tissoires
2014-07-26 3:58 ` Dmitry Torokhov
2014-07-24 18:14 ` [PATCH v2 07/10] Input - wacom: handle Graphire BT tablets in wacom.ko Benjamin Tissoires
2014-07-24 19:35 ` Dmitry Torokhov
2014-07-24 19:43 ` Benjamin Tissoires
2014-07-24 19:58 ` Dmitry Torokhov
2014-07-24 20:11 ` Benjamin Tissoires
2014-07-24 18:14 ` [PATCH v2 08/10] Input - wacom: handle Intuos 4 BT " Benjamin Tissoires
2014-07-24 18:14 ` [PATCH v2 09/10] Input - wacom: add copyright note and bump version to 2.0 Benjamin Tissoires
2014-07-24 18:14 ` [PATCH v2 10/10] HID: remove hid-wacom Bluetooth driver Benjamin Tissoires
2014-07-25 12:42 ` [PATCH v2 00/10] Input - wacom: conversion to HID driver, series 2 Przemo Firszt
2014-07-25 12:58 ` Benjamin Tissoires
2014-07-25 13:30 ` Przemo Firszt
2014-07-25 14:54 ` Benjamin Tissoires
2014-07-25 19:26 ` Przemo Firszt
2014-07-25 19:32 ` Benjamin Tissoires
2014-07-25 22:13 ` Przemo Firszt
2014-07-25 23:15 ` Benjamin Tissoires
2014-07-26 11:55 ` Przemo Firszt
2014-07-25 23:20 ` [PATCH 11/10] Input - wacom: Check for bluetooth protocol while setting OLEDs Benjamin Tissoires
2014-07-26 12:05 ` Przemo Firszt
2014-07-26 1:41 ` [PATCH v2 00/10] Input - wacom: conversion to HID driver, series 2 Dmitry Torokhov
2014-07-26 3:21 ` Benjamin Tissoires
2014-07-26 3:56 ` Dmitry Torokhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1406225645-32141-3-git-send-email-benjamin.tissoires@redhat.com \
--to=benjamin.tissoires@redhat.com \
--cc=dmitry.torokhov@gmail.com \
--cc=jkosina@suse.cz \
--cc=killertofu@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pinglinux@gmail.com \
--cc=przemo@firszt.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).