From patchwork Tue Jun 11 22:02:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping Cheng X-Patchwork-Id: 2706981 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 44CFB9F1E2 for ; Tue, 11 Jun 2013 22:02:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9D52A20164 for ; Tue, 11 Jun 2013 22:02:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8C3482015C for ; Tue, 11 Jun 2013 22:02:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756469Ab3FKWCg (ORCPT ); Tue, 11 Jun 2013 18:02:36 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:53840 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753253Ab3FKWCg (ORCPT ); Tue, 11 Jun 2013 18:02:36 -0400 Received: by mail-pd0-f179.google.com with SMTP id q10so3223312pdj.38 for ; Tue, 11 Jun 2013 15:02:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=GXmcykF2UpoDk4tP4AU2VIm+3WU6EM2IZx/3mhd+BSY=; b=BBA5WWWvliXozKizprpYZKQYzxtusAOT5jVsbsUoXK55c2Ua0KlWVhQ4HePlcKzd8d JkL7Ak+Vv5sjaDILnVK9EstnKV+0Ek97u+SV0BsCGXqkWhanGTPg1V4RMFAsty2XUUKC ffBgQfu7C5IXsb97g5a1H2xzqMLT3RuoRbTTsm+GdkFFYKMLhGJFru4KD9di8ZxdLhAV wCMlpMNQM9IBAosezUE2RSg6FPempda2d1tCefZuFc94UklFxR+kcxOcbNKiKtRHSG2s FCiZEKaBV//F/MjArGgvQHOZnuRD7ZRLQA72Nz0W2kZ8ZMxTM5zJab1DsJHUAGfz91kg p21A== X-Received: by 10.68.190.104 with SMTP id gp8mr16826619pbc.120.1370988155840; Tue, 11 Jun 2013 15:02:35 -0700 (PDT) Received: from wacom-XPS-8500.wacom.com ([67.51.163.2]) by mx.google.com with ESMTPSA id al2sm16221913pbc.25.2013.06.11.15.02.33 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Jun 2013 15:02:34 -0700 (PDT) From: Ping Cheng To: linux-input@vger.kernel.org Cc: dmitry.torokhov@gmail.com, Ping Cheng Subject: [PATCH] Add a new stylus (0x100802) for Intuos5 and Cintiqs Date: Tue, 11 Jun 2013 15:02:25 -0700 Message-Id: <1370988145-12850-1-git-send-email-pingc@wacom.com> X-Mailer: git-send-email 1.8.1.2 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Signed-off-by: Ping Cheng --- drivers/input/tablet/wacom_wac.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 518282d..384fbcd 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -363,6 +363,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom) case 0x140802: /* Intuos4/5 13HD/24HD Classic Pen */ case 0x160802: /* Cintiq 13HD Pro Pen */ case 0x180802: /* DTH2242 Pen */ + case 0x100802: /* Intuos4/5 13HD/24HD General Pen */ wacom->tool[idx] = BTN_TOOL_PEN; break; @@ -401,6 +402,7 @@ static int wacom_intuos_inout(struct wacom_wac *wacom) case 0x10080c: /* Intuos4/5 13HD/24HD Art Pen Eraser */ case 0x16080a: /* Cintiq 13HD Pro Pen Eraser */ case 0x18080a: /* DTH2242 Eraser */ + case 0x10080a: /* Intuos4/5 13HD/24HD General Pen Eraser */ wacom->tool[idx] = BTN_TOOL_RUBBER; break;