From patchwork Fri May 8 21:25:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gerecke, Jason" X-Patchwork-Id: 6367741 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5F15ABEEE1 for ; Fri, 8 May 2015 21:26:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8380520272 for ; Fri, 8 May 2015 21:26:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2C6552026F for ; Fri, 8 May 2015 21:26:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752644AbbEHV0B (ORCPT ); Fri, 8 May 2015 17:26:01 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:35325 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752391AbbEHV0A (ORCPT ); Fri, 8 May 2015 17:26:00 -0400 Received: by pabtp1 with SMTP id tp1so59537913pab.2 for ; Fri, 08 May 2015 14:26:00 -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; bh=87rxZCcqOlRt2IGgzat2uZXg7N6AM2osp2rlsjTUkqk=; b=tuL845hVWaHFgw3sv/kPSO07VSZELe7vF83fyTCsxADzVbdNAZBNRh+S9gNYDgjEmp vSY68yERNgDWlMbjr0mNX0fhJvLRiUHRmNqKYD8vBZPEI9eqlrmKpugrT9kXfGKS+iU0 V0bIeoxkvzmLEGrxzE63ReejsQ7uWEcev2rs/xvVQC53CSmG+VUHK8OeozqEyf/oDN52 uQgyhaKI7x4ddqzGtaWCXypnbH+A4L0+DhllPgMsgp9QcAjEpAEgm1CCUGIGtyRapE/n 2QmNYBd+Ss04UpBnouqgnxuCsXm7ic5Fsj3VCJFJn0mo9/tSLwW3D4EdAKUNgz0pRU0Y 2/rw== X-Received: by 10.67.2.98 with SMTP id bn2mr1626425pad.83.1431120360142; Fri, 08 May 2015 14:26:00 -0700 (PDT) Received: from wacom-arch2.localdomain ([67.51.163.2]) by mx.google.com with ESMTPSA id fe3sm6079487pbd.76.2015.05.08.14.25.57 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 May 2015 14:25:58 -0700 (PDT) From: Jason Gerecke To: Jiri Kosina , Benjamin Tissoires , jono , Ping Cheng Cc: linux-input@vger.kernel.org, Jason Gerecke , Jason Gerecke Subject: [PATCH 1/2] HID: wacom: Allow wacom_{get, set}_report to retry on -EAGAIN Date: Fri, 8 May 2015 14:25:01 -0700 Message-Id: <1431120302-13691-1-git-send-email-killertofu@gmail.com> X-Mailer: git-send-email 2.4.0 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 If we get an -EAGAIN error within either of the wacom_{get,set}_report functions, we should use one of our retries if available. Also, log an error if the functions fail so that we can be aware of what's going on. Signed-off-by: Jason Gerecke --- drivers/hid/wacom_sys.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 7abf52c..3cd74d9 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -35,7 +35,11 @@ static int wacom_get_report(struct hid_device *hdev, u8 type, u8 *buf, do { retval = hid_hw_raw_request(hdev, buf[0], buf, size, type, HID_REQ_GET_REPORT); - } while ((retval == -ETIMEDOUT || retval == -EPIPE) && --retries); + } while ((retval == -ETIMEDOUT || retval == -EPIPE || retval == -EAGAIN) && --retries); + + if (retval < 0) + dev_err(&hdev->dev, "wacom_get_report: ran out of retries " + "(last error = %d)\n", retval); return retval; } @@ -48,7 +52,11 @@ static int wacom_set_report(struct hid_device *hdev, u8 type, u8 *buf, do { retval = hid_hw_raw_request(hdev, buf[0], buf, size, type, HID_REQ_SET_REPORT); - } while ((retval == -ETIMEDOUT || retval == -EPIPE) && --retries); + } while ((retval == -ETIMEDOUT || retval == -EPIPE || retval == -EAGAIN) && --retries); + + if (retval < 0) + dev_err(&hdev->dev, "wacom_set_report: ran out of retries " + "(last error = %d)\n", retval); return retval; }