diff mbox

[2/2] HID: wacom: don't manually release resources for the EKR

Message ID 1488826498-8578-3-git-send-email-skomra@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Aaron Armstrong Skomra March 6, 2017, 6:54 p.m. UTC
Commit 5b779fc introduces the manual release of resources
in wacom_remove() as an addition to the driver's use of devm.
The EKR resources can only be released through
wacom_remote_destroy_one() so we skip the manual release
for it.

Signed-off-by: Aaron Armstrong Skomra <skomra@gmail.com>
---
 drivers/hid/wacom_sys.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index be8f7e2..994bddc 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -2579,7 +2579,9 @@  static void wacom_remove(struct hid_device *hdev)
 
 	/* make sure we don't trigger the LEDs */
 	wacom_led_groups_release(wacom);
-	wacom_release_resources(wacom);
+
+	if (wacom->wacom_wac.features.type != REMOTE)
+		wacom_release_resources(wacom);
 
 	hid_set_drvdata(hdev, NULL);
 }