diff options
| author | Aaron Armstrong Skomra <skomra@gmail.com> | 2017-03-06 10:54:58 -0800 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-03-21 14:44:37 +0100 |
| commit | b6b1f19b06b7d4dcc261a88d74c5fb0a53988b4e (patch) | |
| tree | a12b2c112e6000616fa5805d67f96e1ff3958e36 /drivers | |
| parent | 49cc4c217c0dbb7d09c402472d1f85a81c093f9f (diff) | |
| download | linux-stable-b6b1f19b06b7d4dcc261a88d74c5fb0a53988b4e.tar.gz linux-stable-b6b1f19b06b7d4dcc261a88d74c5fb0a53988b4e.tar.bz2 linux-stable-b6b1f19b06b7d4dcc261a88d74c5fb0a53988b4e.zip | |
HID: wacom: don't manually release resources for the EKR
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.
Fixes: 5b779fc ("HID: wacom: release the resources before leaving despite devm")
Signed-off-by: Aaron Armstrong Skomra <skomra@gmail.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hid/wacom_sys.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index be8f7e2a026f..994bddc55b82 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); } |