From patchwork Tue Mar 7 23:45:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roderick Colenbrander X-Patchwork-Id: 9609987 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9FF62604DD for ; Tue, 7 Mar 2017 23:46:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90F3628535 for ; Tue, 7 Mar 2017 23:46:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 85E982858B; Tue, 7 Mar 2017 23:46:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2084528585 for ; Tue, 7 Mar 2017 23:46:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933223AbdCGXqu (ORCPT ); Tue, 7 Mar 2017 18:46:50 -0500 Received: from mail-pf0-f171.google.com ([209.85.192.171]:34641 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933282AbdCGXqo (ORCPT ); Tue, 7 Mar 2017 18:46:44 -0500 Received: by mail-pf0-f171.google.com with SMTP id v190so6660599pfb.1 for ; Tue, 07 Mar 2017 15:45:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gaikai-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0dUsMCl32NOClmvMFyWNuOMXsmC9u0oZ2TfB/mIbShQ=; b=lf92gCJGr8WIMIulbcypjufV1d/+mpW5PwAH0APcvSu/wPgKDE4L9XcUTxz5bWo8N/ pp29/20SKs5bhE3ZnHyrsT/K8I+jrswry++NfOqoANo49UJCiVz3Pa9kWev3Xz8IY4Ng ulPqA7UpCGZdTRz6MqlMX+VkFZcYGppI0MXxTJlaLQGvVC0s3x0KyIWylH7Qkwxc2KuX h5HL66aMk4+LKGAG2/CyZImrNnH0P3ZWcbVIj+TxU3cwqatt+sa/swVR/kT2FOhsnbGo BKdyZjB+kL67VuiJS8lH1mjEnd1f4OKQ4joG+Kmm2HnNFvb0m4FzwM9J1xA06lW/M2pq kWZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0dUsMCl32NOClmvMFyWNuOMXsmC9u0oZ2TfB/mIbShQ=; b=A/k4OyvSuQMlrnAIM2DivNPHncr8X/ropTWTc/zO7ozzrWYdt3gFcJQdf0rTLSbbHQ rhJ9U7QTVgssEkmbFbcYzAP/iIFJqrbxSyAb1Ex6y6geTU6fN7BNThxB5RnHzvcNDIOw raWkDQtyyJtLrs9Yq85USVNWARXLMbTGYBFoBkNjUYrr5lLYOX2d7uFlyXSfqfuWMO29 z1OWv4rsRNBVhpJ++OfK3V+HD8BYpUzxqNChp1VcF1+jSuArGpi2qocllIe2+510jWqz cDvNQpxXngailFaIOyG1vLLRosWZNLKKE1fzofzpk+Wcl42UwzxtRCAxCt808QDVLtyE QRCA== X-Gm-Message-State: AMke39nin6g9zj0cnHwuqH64+jdz7vXaqyQUCBoy029cz29Bbg8zaioS5PxVZjVHdwJvUPT1 X-Received: by 10.99.142.193 with SMTP id k184mr3427213pge.176.1488930324621; Tue, 07 Mar 2017 15:45:24 -0800 (PST) Received: from roderick.ad.gaikai.biz ([100.42.98.197]) by smtp.gmail.com with ESMTPSA id e7sm1890993pgp.2.2017.03.07.15.45.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Mar 2017 15:45:24 -0800 (PST) From: Roderick Colenbrander To: linux-input@vger.kernel.org Cc: Dmitry Torokhov , Jiri Kosina , Benjamin Tissoires , Simon Wood , Frank Praznik , Tim Bird , Roderick Colenbrander Subject: [PATCH 10/12] HID: sony: Print error on failure to active DS3 / Navigation controllers Date: Tue, 7 Mar 2017 15:45:09 -0800 Message-Id: <20170307234511.30380-11-roderick@gaikai.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170307234511.30380-1-roderick@gaikai.com> References: <20170307234511.30380-1-roderick@gaikai.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Roderick Colenbrander This patch adds printing when we failed to activate DS3 / Nagivation controllers and checks the return value for these failures earlier in sony_input_configured. This paves the way for other configuration logic for these devices, which we don't want to call if for example the activation failed. Signed-off-by: Roderick Colenbrander --- drivers/hid/hid-sony.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index 16f37d6..b82d05c 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c @@ -2468,7 +2468,13 @@ static int sony_input_configured(struct hid_device *hdev, hdev->quirks |= HID_QUIRK_NO_OUTPUT_REPORTS_ON_INTR_EP; hdev->quirks |= HID_QUIRK_SKIP_OUTPUT_REPORT_ID; sc->defer_initialization = 1; + ret = sixaxis_set_operational_usb(hdev); + if (ret < 0) { + hid_err(hdev, "Failed to set controller into operational mode\n"); + goto err_stop; + } + sony_init_output_report(sc, sixaxis_send_output_report); } else if ((sc->quirks & SIXAXIS_CONTROLLER_BT) || (sc->quirks & NAVIGATION_CONTROLLER_BT)) { @@ -2477,7 +2483,13 @@ static int sony_input_configured(struct hid_device *hdev, * when connected via Bluetooth. */ hdev->quirks |= HID_QUIRK_NO_OUTPUT_REPORTS_ON_INTR_EP; + ret = sixaxis_set_operational_bt(hdev); + if (ret < 0) { + hid_err(hdev, "Failed to set controller into operational mode\n"); + goto err_stop; + } + sony_init_output_report(sc, sixaxis_send_output_report); } else if (sc->quirks & DUALSHOCK4_CONTROLLER) { ret = dualshock4_get_calibration_data(sc);