From patchwork Fri Sep 14 23:30:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gerecke, Jason" X-Patchwork-Id: 1461131 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 12EF7DF280 for ; Fri, 14 Sep 2012 23:30:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760292Ab2INXaZ (ORCPT ); Fri, 14 Sep 2012 19:30:25 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:50436 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760291Ab2INXaY (ORCPT ); Fri, 14 Sep 2012 19:30:24 -0400 Received: by pbbrr13 with SMTP id rr13so6335226pbb.19 for ; Fri, 14 Sep 2012 16:30:23 -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=GfERDTq64ERPJDuusYpmJP8j2M6XJtmusB4lIcKiylg=; b=BuuFfeuyL9zydWFpX7JcFZ3BPw4U+BGFUcTyhlwmapjc4xfSrpKJniIjLEHFpSr/Nk TwXB8ezso+HA78q903UN4fO0x6nQBONP2XVvwHvU1k6FPrnU6OU+2Ot9RZ7If7YDnTVN pakThfE7I//ZX+w7BJk1UD/Fdi119lXAtxEgWpGw9h+pOMbNXOHeCPGGvy8Q4LbQ+gfI Zf/5fw7mRXT2biSJP2yw2t1zaJ4/Vmdcv0sPd3hWdOuUOnehvJLvP/IiZGfLbRCluCBG Y8s1m7MncH1dwtC30tLdpPBrhh2AIN/R7lschPkzgnCnlSqAYUXjQZ3zQxvw2aYpRvV+ +TDg== Received: by 10.66.85.70 with SMTP id f6mr6263149paz.7.1347665423705; Fri, 14 Sep 2012 16:30:23 -0700 (PDT) Received: from wacom-arch.wacom.com ([67.51.163.2]) by mx.google.com with ESMTPS id it6sm1780655pbc.14.2012.09.14.16.30.21 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 14 Sep 2012 16:30:22 -0700 (PDT) From: Jason Gerecke To: linux-input@vger.kernel.org, linuxwacom-devel@lists.sourceforge.net, dmitry.torokhov@gmail.com, pinglinux@gmail.com, chris@cnpbagwell.com Cc: Jason Gerecke Subject: [PATCH] Input: wacom - Mark Intuos5 pad as in-prox when touching buttons Date: Fri, 14 Sep 2012 16:30:05 -0700 Message-Id: <1347665405-2078-1-git-send-email-killertofu@gmail.com> X-Mailer: git-send-email 1.7.12 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org If the ExpressKeys on the Intuos5 are touched, they currently result an out-of-prox packet being sent even if the pad is already out of prox. This can cause some confusion in the X driver. To restore the expected semantics, we make being touched a sufficient condition to signal proximity. https://bugs.freedesktop.org/show_bug.cgi?id=54250 Reported-by: Timo Aaltonen Signed-off-by: Jason Gerecke Reviewed-by: Chris Bagwell --- drivers/input/tablet/wacom_wac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 532d067..9317109 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -606,7 +606,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom) input_report_abs(input, ABS_WHEEL, 0); } - if (data[2] | (data[3] & 0x01) | data[4]) { + if (data[2] | (data[3] & 0x01) | data[4] | data[5]) { input_report_key(input, wacom->tool[1], 1); input_report_abs(input, ABS_MISC, PAD_DEVICE_ID); } else {