summaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorJason Gerecke2015-03-06 20:47:42 +0100
committerJiri Kosina2015-03-11 16:46:13 +0100
commit2d13a43813729850572606a653f06c9e567e4c8d (patch)
tree0a504d5180690cef15968c1009c2cea59e629e28 /drivers/hid
parentHID: wacom: Provide battery charge state to system over USB if available (diff)
downloadkernel-qcow2-linux-2d13a43813729850572606a653f06c9e567e4c8d.tar.gz
kernel-qcow2-linux-2d13a43813729850572606a653f06c9e567e4c8d.tar.xz
kernel-qcow2-linux-2d13a43813729850572606a653f06c9e567e4c8d.zip
HID: wacom: Report battery status for Intuos Pro and Intuos5
Calls the wacom_status_irq function to report battery status for the Intuos Pro and Intuos5 (in addition to the already-reporting Intuos and last-generation Bamboo). Signed-off-by: Jason Gerecke <killertofu@gmail.com> Acked-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/wacom_wac.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c
index f1e53f15abb5..726fedb87a16 100644
--- a/drivers/hid/wacom_wac.c
+++ b/drivers/hid/wacom_wac.c
@@ -2062,6 +2062,8 @@ void wacom_wac_irq(struct wacom_wac *wacom_wac, size_t len)
case INTUOSPL:
if (len == WACOM_PKGLEN_BBTOUCH3)
sync = wacom_bpt3_touch(wacom_wac);
+ else if (wacom_wac->data[0] == WACOM_REPORT_USB)
+ sync = wacom_status_irq(wacom_wac, len);
else
sync = wacom_intuos_irq(wacom_wac);
break;