From e2a6e6abc32ef38782d0fe906f52745aaeeb24a5 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Tue, 12 Apr 2016 08:12:11 -0400 Subject: [PATCH] Fix Bamboo ONE issues (rhbz 1317116) --- HID-wacom-fix-Bamboo-ONE-oops.patch | 46 +++++++++++++++++++++++++++++ kernel.spec | 6 ++++ 2 files changed, 52 insertions(+) create mode 100644 HID-wacom-fix-Bamboo-ONE-oops.patch diff --git a/HID-wacom-fix-Bamboo-ONE-oops.patch b/HID-wacom-fix-Bamboo-ONE-oops.patch new file mode 100644 index 000000000..09e83179a --- /dev/null +++ b/HID-wacom-fix-Bamboo-ONE-oops.patch @@ -0,0 +1,46 @@ +From 580549ef6b3e3fb3b958de490ca99f43a089a2cf Mon Sep 17 00:00:00 2001 +From: Benjamin Tissoires +Date: Fri, 25 Mar 2016 15:26:55 +0100 +Subject: [PATCH] HID: wacom: fix Bamboo ONE oops + +Looks like recent changes in the Wacom driver made the Bamboo ONE crashes. +The tablet behaves as if it was a regular Bamboo device with pen, touch +and pad, but there is no physical pad connected to it. +The weird part is that the pad is still sending events and given that +there is no input node connected to it, we get anull pointer exception. + +Link: https://bugzilla.redhat.com/show_bug.cgi?id=1317116 + +Signed-off-by: Benjamin Tissoires +Acked-by: Ping Cheng +Cc: stable@vger.kernel.org +Signed-off-by: Jiri Kosina +--- + drivers/hid/wacom_wac.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c +index bd198bbd4df0..02c4efea241c 100644 +--- a/drivers/hid/wacom_wac.c ++++ b/drivers/hid/wacom_wac.c +@@ -2426,6 +2426,17 @@ void wacom_setup_device_quirks(struct wacom *wacom) + } + + /* ++ * Hack for the Bamboo One: ++ * the device presents a PAD/Touch interface as most Bamboos and even ++ * sends ghosts PAD data on it. However, later, we must disable this ++ * ghost interface, and we can not detect it unless we set it here ++ * to WACOM_DEVICETYPE_PAD or WACOM_DEVICETYPE_TOUCH. ++ */ ++ if (features->type == BAMBOO_PEN && ++ features->pktlen == WACOM_PKGLEN_BBTOUCH3) ++ features->device_type |= WACOM_DEVICETYPE_PAD; ++ ++ /* + * Raw Wacom-mode pen and touch events both come from interface + * 0, whose HID descriptor has an application usage of 0xFF0D + * (i.e., WACOM_VENDORDEFINED_PEN). We route pen packets back +-- +2.5.5 + diff --git a/kernel.spec b/kernel.spec index a8608fd07..d166d8878 100644 --- a/kernel.spec +++ b/kernel.spec @@ -692,6 +692,9 @@ Patch688: x86-iopl-64-Properly-context-switch-IOPL-on-Xen-PV.patch # CVE-2016-3672 rhbz 1324749 1324750 Patch689: x86-mm-32-Enable-full-randomization-on-i386-and-X86_.patch +#rhbz 1317116 +Patch697: HID-wacom-fix-Bamboo-ONE-oops.patch + # END OF PATCH DEFINITIONS %endif @@ -2213,6 +2216,9 @@ fi # # %changelog +* Tue Apr 12 2016 Josh Boyer +- Fix Bamboo ONE issues (rhbz 1317116) + * Mon Apr 11 2016 Peter Robinson - Add upstream patch to fix IDIV issue when booting on Cortex-A7/15/17 devices - Update bcm238x patch