From patchwork Fri Mar 6 19:47:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gerecke, Jason" X-Patchwork-Id: 5957671 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 867709F380 for ; Fri, 6 Mar 2015 19:48:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C750F20263 for ; Fri, 6 Mar 2015 19:48:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EE3472038D for ; Fri, 6 Mar 2015 19:48:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755968AbbCFTsO (ORCPT ); Fri, 6 Mar 2015 14:48:14 -0500 Received: from mail-pa0-f42.google.com ([209.85.220.42]:35551 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755916AbbCFTsN (ORCPT ); Fri, 6 Mar 2015 14:48:13 -0500 Received: by pabli10 with SMTP id li10so54063366pab.2 for ; Fri, 06 Mar 2015 11:48:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NZEsNtQJGzviS0G3JeUDhULyGLRrLIoY4qIsdrL6x10=; b=S6Whdb+4quQi5zV459DzIOXDm31OrBbpIeLM8DP5Ljp7LHBMDHrJbMvzgxeaYiMp/g JicmspHlLszitHCwoMVOf0q7TXt9MxZqPT/PX5D9HQy39YxuTIBiMllyifWirT2MMdK+ 4lu2LQnY0mjTj1ClzTZZ8TTB0GsxToiWYWd0oAhRkcxLhVPqCKbgr9lKALOvrguIkg56 XXJa5qt9dnvz6bvZqSkdOEEcUWLx0hpz4ZTPBTaEkR7XlpamsD0RRmGYs+U1zwKntFKN MBDE8Qr9j67FDI9+8rkY6Sup1ipJzjI82dBt4yaOR69su6nBEAhwcntVbSFC8zgNCmMK Tulg== X-Received: by 10.68.206.101 with SMTP id ln5mr28150159pbc.156.1425671293158; Fri, 06 Mar 2015 11:48:13 -0800 (PST) Received: from wacom-arch2.localdomain ([67.51.163.2]) by mx.google.com with ESMTPSA id gf2sm2367452pbc.60.2015.03.06.11.48.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Mar 2015 11:48:12 -0800 (PST) From: Jason Gerecke To: jkosina@suse.cz, linux-input@vger.kernel.org Cc: pinglinux@gmail.com, benjamin.tissoires@redhat.com, Jason Gerecke Subject: [PATCH 5/7] HID: wacom: Report battery status for Intuos Pro and Intuos5 Date: Fri, 6 Mar 2015 11:47:42 -0800 Message-Id: <1425671264-4944-12-git-send-email-killertofu@gmail.com> X-Mailer: git-send-email 2.3.0 In-Reply-To: <1425671264-4944-1-git-send-email-killertofu@gmail.com> References: <1425671264-4944-1-git-send-email-killertofu@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- drivers/hid/wacom_wac.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index f1e53f1..726fedb 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;