All of lore.kernel.org
 help / color / mirror / Atom feed
From: Aaron Armstrong Skomra <skomra@gmail.com>
To: linux-input@vger.kernel.org, jkosina@suse.cz,
	pinglinux@gmail.com, Ping.Cheng@wacom.com, killertofu@gmail.com,
	benjamin.tissoires@redhat.com
Cc: Aaron Armstrong Skomra <skomra@gmail.com>
Subject: [PATCH 2/2] HID: wacom: don't manually release resources for the EKR
Date: Mon,  6 Mar 2017 10:54:58 -0800	[thread overview]
Message-ID: <1488826498-8578-3-git-send-email-skomra@gmail.com> (raw)
In-Reply-To: <1488826498-8578-1-git-send-email-skomra@gmail.com>

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 --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);
 }
-- 
2.7.4


  parent reply	other threads:[~2017-03-06 19:04 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-06 18:54 [PATCH 0/2] HID: wacom: patches for 4.11 Aaron Armstrong Skomra
2017-03-06 18:54 ` [PATCH 1/2] HID: wacom: Correct Intuos Pro 2 resolution Aaron Armstrong Skomra
2017-03-06 18:54 ` Aaron Armstrong Skomra [this message]
2017-03-07 10:34 ` [PATCH 0/2] HID: wacom: patches for 4.11 Benjamin Tissoires
2017-03-15  1:38   ` Ping Cheng
2017-03-16 20:23     ` Jiri Kosina
2017-03-21 13:44 ` Jiri Kosina

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=1488826498-8578-3-git-send-email-skomra@gmail.com \
    --to=skomra@gmail.com \
    --cc=Ping.Cheng@wacom.com \
    --cc=benjamin.tissoires@redhat.com \
    --cc=jkosina@suse.cz \
    --cc=killertofu@gmail.com \
    --cc=linux-input@vger.kernel.org \
    --cc=pinglinux@gmail.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.