* [PATCH 0/2] HID: wacom: patches for 4.11 @ 2017-03-06 18:54 Aaron Armstrong Skomra 2017-03-06 18:54 ` [PATCH 1/2] HID: wacom: Correct Intuos Pro 2 resolution Aaron Armstrong Skomra ` (3 more replies) 0 siblings, 4 replies; 7+ messages in thread From: Aaron Armstrong Skomra @ 2017-03-06 18:54 UTC (permalink / raw) To: linux-input, jkosina, pinglinux, Ping.Cheng, killertofu, benjamin.tissoires Cc: Aaron Armstrong Skomra Two fixes for patches included in 4.11 Aaron Armstrong Skomra (2): HID: wacom: Correct Intuos Pro 2 resolution HID: wacom: don't manually release resources for the EKR drivers/hid/wacom_sys.c | 4 +++- drivers/hid/wacom_wac.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) -- 2.7.4 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] HID: wacom: Correct Intuos Pro 2 resolution 2017-03-06 18:54 [PATCH 0/2] HID: wacom: patches for 4.11 Aaron Armstrong Skomra @ 2017-03-06 18:54 ` Aaron Armstrong Skomra 2017-03-06 18:54 ` [PATCH 2/2] HID: wacom: don't manually release resources for the EKR Aaron Armstrong Skomra ` (2 subsequent siblings) 3 siblings, 0 replies; 7+ messages in thread From: Aaron Armstrong Skomra @ 2017-03-06 18:54 UTC (permalink / raw) To: linux-input, jkosina, pinglinux, Ping.Cheng, killertofu, benjamin.tissoires Cc: Aaron Armstrong Skomra The features struct for the second gen Intuos Pro uses the wrong constant for the resolution. This fix is for commit 4922cd2. Signed-off-by: Aaron Armstrong Skomra <skomra@gmail.com> --- drivers/hid/wacom_wac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index 4aa3de9..3d86446 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c @@ -4197,10 +4197,10 @@ static const struct wacom_features wacom_features_0x343 = WACOM_DTU_OFFSET, WACOM_DTU_OFFSET }; static const struct wacom_features wacom_features_0x360 = { "Wacom Intuos Pro M", 44800, 29600, 8191, 63, - INTUOSP2_BT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, 9, .touch_max = 10 }; + INTUOSP2_BT, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 9, .touch_max = 10 }; static const struct wacom_features wacom_features_0x361 = { "Wacom Intuos Pro L", 62200, 43200, 8191, 63, - INTUOSP2_BT, WACOM_INTUOS_RES, WACOM_INTUOS_RES, 9, .touch_max = 10 }; + INTUOSP2_BT, WACOM_INTUOS3_RES, WACOM_INTUOS3_RES, 9, .touch_max = 10 }; static const struct wacom_features wacom_features_HID_ANY_ID = { "Wacom HID", .type = HID_GENERIC, .oVid = HID_ANY_ID, .oPid = HID_ANY_ID }; -- 2.7.4 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] HID: wacom: don't manually release resources for the EKR 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 2017-03-07 10:34 ` [PATCH 0/2] HID: wacom: patches for 4.11 Benjamin Tissoires 2017-03-21 13:44 ` Jiri Kosina 3 siblings, 0 replies; 7+ messages in thread From: Aaron Armstrong Skomra @ 2017-03-06 18:54 UTC (permalink / raw) To: linux-input, jkosina, pinglinux, Ping.Cheng, killertofu, benjamin.tissoires Cc: Aaron Armstrong Skomra 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 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 0/2] HID: wacom: patches for 4.11 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 ` [PATCH 2/2] HID: wacom: don't manually release resources for the EKR Aaron Armstrong Skomra @ 2017-03-07 10:34 ` Benjamin Tissoires 2017-03-15 1:38 ` Ping Cheng 2017-03-21 13:44 ` Jiri Kosina 3 siblings, 1 reply; 7+ messages in thread From: Benjamin Tissoires @ 2017-03-07 10:34 UTC (permalink / raw) To: Aaron Armstrong Skomra Cc: linux-input, jkosina, pinglinux, Ping.Cheng, killertofu On Mar 06 2017 or thereabouts, Aaron Armstrong Skomra wrote: > Two fixes for patches included in 4.11 > > Aaron Armstrong Skomra (2): > HID: wacom: Correct Intuos Pro 2 resolution > HID: wacom: don't manually release resources for the EKR Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Aaron told me about the issue in patch 2/2, so it's not news to me. Cheers, Benjamin > > drivers/hid/wacom_sys.c | 4 +++- > drivers/hid/wacom_wac.c | 4 ++-- > 2 files changed, 5 insertions(+), 3 deletions(-) > > -- > 2.7.4 > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/2] HID: wacom: patches for 4.11 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 0 siblings, 1 reply; 7+ messages in thread From: Ping Cheng @ 2017-03-15 1:38 UTC (permalink / raw) To: Benjamin Tissoires Cc: Aaron Armstrong Skomra, linux-input, Jiri Kosina, Jason Gerecke Hi Jiri, On Tue, Mar 7, 2017 at 2:34 AM, Benjamin Tissoires <benjamin.tissoires@redhat.com> wrote: > On Mar 06 2017 or thereabouts, Aaron Armstrong Skomra wrote: >> Two fixes for patches included in 4.11 >> >> Aaron Armstrong Skomra (2): >> HID: wacom: Correct Intuos Pro 2 resolution >> HID: wacom: don't manually release resources for the EKR > > Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> > > Aaron told me about the issue in patch 2/2, so it's not news to me. > > Cheers, > Benjamin > >> >> drivers/hid/wacom_sys.c | 4 +++- >> drivers/hid/wacom_wac.c | 4 ++-- >> 2 files changed, 5 insertions(+), 3 deletions(-) I don't see the two patches under for-4.11/upstream-fixes. Do you have questions about the patches? Cheers, Ping >> >> -- >> 2.7.4 >> ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/2] HID: wacom: patches for 4.11 2017-03-15 1:38 ` Ping Cheng @ 2017-03-16 20:23 ` Jiri Kosina 0 siblings, 0 replies; 7+ messages in thread From: Jiri Kosina @ 2017-03-16 20:23 UTC (permalink / raw) To: Ping Cheng Cc: Benjamin Tissoires, Aaron Armstrong Skomra, linux-input, Jason Gerecke On Tue, 14 Mar 2017, Ping Cheng wrote: > >> Aaron Armstrong Skomra (2): > >> HID: wacom: Correct Intuos Pro 2 resolution > >> HID: wacom: don't manually release resources for the EKR > > > > Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> > > > > Aaron told me about the issue in patch 2/2, so it's not news to me. > >> > >> drivers/hid/wacom_sys.c | 4 +++- > >> drivers/hid/wacom_wac.c | 4 ++-- > >> 2 files changed, 5 insertions(+), 3 deletions(-) > > I don't see the two patches under for-4.11/upstream-fixes. Do you have > questions about the patches? Nope (or not yet at least), I haven't processed them yet. -rc3 or -rc4 is still a target for those. -- Jiri Kosina SUSE Labs ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/2] HID: wacom: patches for 4.11 2017-03-06 18:54 [PATCH 0/2] HID: wacom: patches for 4.11 Aaron Armstrong Skomra ` (2 preceding siblings ...) 2017-03-07 10:34 ` [PATCH 0/2] HID: wacom: patches for 4.11 Benjamin Tissoires @ 2017-03-21 13:44 ` Jiri Kosina 3 siblings, 0 replies; 7+ messages in thread From: Jiri Kosina @ 2017-03-21 13:44 UTC (permalink / raw) To: Aaron Armstrong Skomra Cc: linux-input, pinglinux, Ping.Cheng, killertofu, benjamin.tissoires On Mon, 6 Mar 2017, Aaron Armstrong Skomra wrote: > Two fixes for patches included in 4.11 > > Aaron Armstrong Skomra (2): > HID: wacom: Correct Intuos Pro 2 resolution > HID: wacom: don't manually release resources for the EKR > > drivers/hid/wacom_sys.c | 4 +++- > drivers/hid/wacom_wac.c | 4 ++-- > 2 files changed, 5 insertions(+), 3 deletions(-) Applied to for-4.11/upstream-fxies. Thanks, -- Jiri Kosina SUSE Labs ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-03-21 13:44 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 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 ` [PATCH 2/2] HID: wacom: don't manually release resources for the EKR Aaron Armstrong Skomra 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
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.