From patchwork Fri Aug 26 21:31:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gerecke, Jason" X-Patchwork-Id: 1103262 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7QLVba6013488 for ; Fri, 26 Aug 2011 21:31:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755493Ab1HZVbh (ORCPT ); Fri, 26 Aug 2011 17:31:37 -0400 Received: from mail-yw0-f46.google.com ([209.85.213.46]:44713 "EHLO mail-yw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755492Ab1HZVbg (ORCPT ); Fri, 26 Aug 2011 17:31:36 -0400 Received: by ywf7 with SMTP id 7so3197652ywf.19 for ; Fri, 26 Aug 2011 14:31:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=UNAUyy0bNq/5Owc73hoJYvY5FuCRlLQrnyxSgDc7xoY=; b=nB4LsGgNOye5yQv67VPby9KzYgYq0y8uusjCx1XrbZi5QUKSh2k+ks+EHD3XNBxd6G VPnZd3O331RPgQ7OD874ZgNbKcGguLUHnqVjY9IZocWVUQvgJFnOEMPCByLn2qKTJX9G HlEStRAiqjylrc1V91n2BI3nkrGAkT2yPWUeM= Received: by 10.142.207.1 with SMTP id e1mr788468wfg.13.1314394295844; Fri, 26 Aug 2011 14:31:35 -0700 (PDT) Received: from localhost.localdomain ([204.119.25.44]) by mx.google.com with ESMTPS id i1sm3803094pbe.1.2011.08.26.14.31.33 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 26 Aug 2011 14:31:34 -0700 (PDT) From: Jason Gerecke To: linux-input@vger.kernel.org Cc: pinglinux@gmail.com, dmitry.torokhov@gmail.com, Jason Gerecke Subject: [PATCH] Input: wacom - Advertise BTN_TOOL_PEN and BTN_STYLUS for PenPartner Date: Fri, 26 Aug 2011 14:31:25 -0700 Message-Id: <1314394285-6994-1-git-send-email-killertofu@gmail.com> X-Mailer: git-send-email 1.7.6 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 26 Aug 2011 21:31:38 +0000 (UTC) The Wacom PenPartner should advertise its stylus tip and button in addition to the eraser tool. These are both physically present on the hardware, and emitted from 'wacom_penpartner_irq'. Signed-off-by: Jason Gerecke Reviewed-by: Ping Cheng --- drivers/input/tablet/wacom_wac.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index c1c2f7b..87b0e0d 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -1191,13 +1191,13 @@ void wacom_setup_input_capabilities(struct input_dev *input_dev, case PL: case PTU: case DTU: - __set_bit(BTN_TOOL_PEN, input_dev->keybit); - __set_bit(BTN_STYLUS, input_dev->keybit); __set_bit(BTN_STYLUS2, input_dev->keybit); /* fall through */ case PENPARTNER: + __set_bit(BTN_TOOL_PEN, input_dev->keybit); __set_bit(BTN_TOOL_RUBBER, input_dev->keybit); + __set_bit(BTN_STYLUS, input_dev->keybit); break; case BAMBOO_PT: