From patchwork Thu May 21 17:44:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gerecke, Jason" X-Patchwork-Id: 6457891 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 8890C9F318 for ; Thu, 21 May 2015 17:45:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AA13A20523 for ; Thu, 21 May 2015 17:45:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D631620522 for ; Thu, 21 May 2015 17:45:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755841AbbEURpE (ORCPT ); Thu, 21 May 2015 13:45:04 -0400 Received: from mail-pd0-f180.google.com ([209.85.192.180]:32989 "EHLO mail-pd0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755846AbbEURpD (ORCPT ); Thu, 21 May 2015 13:45:03 -0400 Received: by pdbqa5 with SMTP id qa5so115455384pdb.0 for ; Thu, 21 May 2015 10:45:02 -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:in-reply-to:references; bh=LFyYVIYjkl11z/XysCgu8ucwtnIVscJwF/8p4CZwt8I=; b=wOvuL4Soen1f/L+PxJvPab0Tp3YWDvbN7pUIhnVXotdUKUcVzmRMTqy3kyc6VC7Kod TKI6pmtONYrqNiEaMGmw/IvmbgryyZ3mWNRw01Y50UfBUtegG4h/02o7e0mda/ff92Ro lDIsm6imPqaGVYiupqAckwhKX9Wj0vGxTukFjuMjKosVTnOyCUqmjCKR5z9DU0u2/OBX 8ok14UVUkvNMpP/E5aGK95SU08XznMl9auH5aKOX2lAcHTcuhtGs+esb9lvhy/AMpv8N k/Lu0myAhuywvB0G5/Jvlzvvk6QtAlBjM8a85XvkQnKC6RdKYFPvW8wbtoSiaMzcpIvd in5g== X-Received: by 10.68.194.6 with SMTP id hs6mr7892975pbc.58.1432230302134; Thu, 21 May 2015 10:45:02 -0700 (PDT) Received: from wacom-arch2.localdomain ([67.51.163.2]) by mx.google.com with ESMTPSA id da3sm19881738pdb.8.2015.05.21.10.45.00 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 May 2015 10:45:00 -0700 (PDT) From: Jason Gerecke To: Jiri Kosina , Benjamin Tissoires , Ping Cheng , Aaron Skomra Cc: linux-input@vger.kernel.org, Jason Gerecke , Jason Gerecke Subject: [PATCH v2 2/2] HID: wacom: Handle failing HID_DG_CONTACTMAX requests Date: Thu, 21 May 2015 10:44:32 -0700 Message-Id: <1432230272-3614-2-git-send-email-killertofu@gmail.com> X-Mailer: git-send-email 2.4.1 In-Reply-To: <1432230272-3614-1-git-send-email-killertofu@gmail.com> References: <1431120302-13691-1-git-send-email-killertofu@gmail.com> <1432230272-3614-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 Hardware may not respond to a request for the HID_DG_CONTACTMAX feature and we should be tolerant of such a failure. This is especially true when using hid-replay where the hardware doesn't exist, but also for devices attached to a flaky bus. This patch increases the number of allowable retries to match other calls to 'wacom_get_report' and also provides a fallback which forces 'touch_max = 16' (enough for any Wacom device seen so far). Signed-off-by: Jason Gerecke --- Changed in v2: - Fixed placement of 'else' - Use 'hid_warn' instead of 'dev_warn' drivers/hid/wacom_sys.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 109312f..eea18a6 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -125,9 +125,16 @@ static void wacom_feature_mapping(struct hid_device *hdev, break; data[0] = field->report->id; ret = wacom_get_report(hdev, HID_FEATURE_REPORT, - data, 2, 0); - if (ret == 2) + data, 2, WAC_CMD_RETRIES); + if (ret == 2) { features->touch_max = data[1]; + } else { + features->touch_max = 16; + hid_warn(hdev, "wacom_feature_mapping: " + "could not get HID_DG_CONTACTMAX, " + "defaulting to %d\n", + features->touch_max); + } kfree(data); } break;