From patchwork Wed Aug 5 22:45:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gerecke X-Patchwork-Id: 6954811 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 C91A7C05AC for ; Wed, 5 Aug 2015 22:45:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D6AA320644 for ; Wed, 5 Aug 2015 22:45:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 089DF20642 for ; Wed, 5 Aug 2015 22:45:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755255AbbHEWpe (ORCPT ); Wed, 5 Aug 2015 18:45:34 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:33810 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754407AbbHEWpd (ORCPT ); Wed, 5 Aug 2015 18:45:33 -0400 Received: by pawu10 with SMTP id u10so46343040paw.1 for ; Wed, 05 Aug 2015 15:45:33 -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=IDlk6gdKhDWb4Y4WnbwPTymoti9FIC21h0cZyvWV5Sg=; b=kkcBdQ0oJ5Xoqxn0f4s2bvSpPJknPX1YiQOuEY3fPo/Vuw3OiDqoeBnRF4ZUPImU31 UNpjC8TJ3EJXvLOhAaQCG9oWFKXq73oqlG/1H3fTGMkWnsjqfD79qcORYIo+tu77SBQ5 D0R2nft48WyDh6OVi2iBd8+e2gaGdNDPeiz3PkKmDEwdRZ4mx0d94ZjiYAEO4KUMEDs/ CyJ1mcuy1TyG+c+yUUpgud/5a1U4k3ijqK6neHk6VcsORBOA9jT/m1laDlth+vGBLsDG MFgpkuhTyzKJyTzEpMrsDDN93lGfJV3eWGW27O/CYrpeAooOStkexcYxZDoy3aGJocbJ wZ0A== X-Received: by 10.68.174.35 with SMTP id bp3mr24421142pbc.124.1438814733255; Wed, 05 Aug 2015 15:45:33 -0700 (PDT) Received: from wacom-arch2.localdomain ([67.51.163.2]) by smtp.gmail.com with ESMTPSA id jg7sm4105567pac.1.2015.08.05.15.45.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Aug 2015 15:45:32 -0700 (PDT) From: Jason Gerecke To: Jiri Kosina , Benjamin Tissoires Cc: linux-input@vger.kernel.org, Ping Cheng , Aaron Skomra , Jason Gerecke , Jason Gerecke Subject: [PATCH] HID: wacom: Do not repeatedly attempt to set device mode on error Date: Wed, 5 Aug 2015 15:45:30 -0700 Message-Id: <1438814730-12108-1-git-send-email-killertofu@gmail.com> X-Mailer: git-send-email 2.5.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.9 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 As an extension of aef3156d7, there is no sense in repeatedly calling the 'wacom_set_report' and 'wacom_get_report' functions if they return an error. Getting an error from them implies that the device is out to lunch: either a hard error code was returned or repeated attempts at recovering from a "soft" error all failed. In either case, doing even more retries is not likely to resolve whatever is wrong. Signed-off-by: Jason Gerecke --- drivers/hid/wacom_sys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 20d15c5..6edb7d1 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -335,7 +335,7 @@ static int wacom_set_device_mode(struct hid_device *hdev, int report_id, if (error >= 0) error = wacom_get_report(hdev, HID_FEATURE_REPORT, rep_data, length, 1); - } while ((error < 0 || rep_data[1] != mode) && limit++ < WAC_MSG_RETRIES); + } while (error >= 0 && rep_data[1] != mode && limit++ < WAC_MSG_RETRIES); kfree(rep_data);