From patchwork Sat Jul 23 08:27:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cameron Gutman X-Patchwork-Id: 9244527 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 15F9C60757 for ; Sat, 23 Jul 2016 08:27:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E59A5280CF for ; Sat, 23 Jul 2016 08:27:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C4AF12819A; Sat, 23 Jul 2016 08:27:52 +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_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 73E38280CF for ; Sat, 23 Jul 2016 08:27:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750828AbcGWI1p (ORCPT ); Sat, 23 Jul 2016 04:27:45 -0400 Received: from mail-pa0-f66.google.com ([209.85.220.66]:33284 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750791AbcGWI1o (ORCPT ); Sat, 23 Jul 2016 04:27:44 -0400 Received: by mail-pa0-f66.google.com with SMTP id q2so8188457pap.0 for ; Sat, 23 Jul 2016 01:27:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=Am51ED8llQXKpjwYL0FCNClWSnwiXBaHqRIcOdB64zc=; b=Z6xRRZNXrpCzfH9wVzatHghAvhWpNmTh0lnc71b5XcsIvg1HXygAnSvr3pkuBwtEUb NWMTtiRy8rQ6nkmnv9oi4f0NJe2ZZtcGqPw2weKgq9xLRqcV61Lxgaa50IR1XRANChJ3 mEGqEXYVF9loUwCWeBqKYLAvmeynL8rw4oCLDrMQqt01ErU/w8lDkLZBkOpPv6PCxzAC 3dlUrMxiqkVaxd5hWgrJQmSDlYt28YKhkUOGV94HjkWd0UM31NH9FG0vH4KHbrb56v5Y fc0paKGiGj7tnb/oK2kJiQycQgGrUp/NZ1wBYrUT5xmzoWdd2/G4mZMMWklsX7ujlWQ5 lHhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=Am51ED8llQXKpjwYL0FCNClWSnwiXBaHqRIcOdB64zc=; b=IeKqqbN2aN7l2JCKN1zy7ipNIFJbvjubNisZ8woMMfJs5r11DSWyGfBoxgB90slfo5 ggA08BkvW1kSKQc7V6M5luTNyOCxTqZ8XZ10blSNeOBRnkH9//yTLdRY/xzZKFgky64T Rw8C/LG0HG1w3x1N494GrQYr1iIUZPW0huiibk4SEDRKNWT5662ZYRu6yc+cBxFFowir 6DaZE7YR3DvHitCFl+q0mNFw/2YDrAN+sPMxxAbx7xBPFuq+n2etxsdz6IFzbo3JqYtK bVbIrgzDK9/7y5L0lEA0FmherooiZRrZds4WljNbhY61uxCH9Ps22TFurx98x6CHqvNu wvEg== X-Gm-Message-State: AEkooutguMXppRBATK22JJYiz2bKoDk2xzCMMmM9cZ8rjr1HwZkqkdBCCQ0SYYIVxNxFbA== X-Received: by 10.66.199.72 with SMTP id ji8mr13318380pac.52.1469262463395; Sat, 23 Jul 2016 01:27:43 -0700 (PDT) Received: from [192.168.1.139] (c-24-16-1-64.hsd1.wa.comcast.net. [24.16.1.64]) by smtp.gmail.com with ESMTPSA id g27sm25124081pfd.47.2016.07.23.01.27.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Jul 2016 01:27:42 -0700 (PDT) To: dmitry.torokhov@gmail.com, rojtberg@gmail.com Cc: linux-input@vger.kernel.org From: Cameron Gutman Subject: [PATCH] Input: xpad - fix wireless 360 controller breaking after suspend Message-ID: <0635c1d0-7572-bac9-99cc-7a0db54c9013@gmail.com> Date: Sat, 23 Jul 2016 01:27:41 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 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 Suspending and resuming the system can sometimes cause the out URB to get hung after a reset_resume. This causes LED setting and force feedback to break on resume. To avoid this, just drop the reset_resume callback so the USB core rebinds xpad to the wireless pads on resume if a reset happened. A nice side effect of this change is the LED ring on wireless controllers is now set correctly on system resume. Signed-off-by: Cameron Gutman Cc: stable@vger.kernel.org --- drivers/input/joystick/xpad.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index a529a45..843054a 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -1626,7 +1626,6 @@ static struct usb_driver xpad_driver = { .disconnect = xpad_disconnect, .suspend = xpad_suspend, .resume = xpad_resume, - .reset_resume = xpad_resume, .id_table = xpad_table, };