From patchwork Thu Oct 13 17:53:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2278 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp422312wrs; Thu, 13 Oct 2022 11:36:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7njvwankiLtr0PHcxwN2EI6vO/pDMRZns5YHF8NfKokGQxZ1vzsRHJ3ZkkovB4iMjuo6ph X-Received: by 2002:a05:6402:3806:b0:450:bad8:8cd5 with SMTP id es6-20020a056402380600b00450bad88cd5mr966426edb.305.1665686164611; Thu, 13 Oct 2022 11:36:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665686164; cv=none; d=google.com; s=arc-20160816; b=n0RbTdICx6drU9wkKrbdg3nwpNgyPQ7B3adK24bWwwKz8vbcD/WCA9x95PXx8lKe+v gF9eRdtBYXqDquFfF6tJB1a9AA8wp12nG00ZmedR2SMcTH0DVIU3JGIw885g6rYZNiGr 0iFlZwbZi+08TXdUiNWsciG1gGktyprB/Vn65Lm0OUjEwAw40+L7APXRM1kZwONUa2wV p/By80Jz/xS7Bvu2WBhIx+zOtVu/TBW+Rq8x9pebtmv+XCkR6FNCHiILNE3zcW/GFusg 04gszHCVnyCstmb7uD5/B09/lLOShOeFiCB2W+1oUYLYj2dAqtcs72z3f/TDZ11eRsTC FZbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FZ1YaeSNy/pNi3dcImhxesDJb5g81XsNXUAZ07POFWY=; b=PoYhxdJLkSfJnAjKGYM2koR8bkHQwmxs6GVgB574B7RCk6+SFicffFd01CBi8tezQj ERYdlILXxL5TQ+4Xh3Cnm0sCKOr5MaLKymrQfj7p3vtUX/ooDut1OTjwqlHWmtHO++Hg EETXB4zqCh/6rxonL6XXgKQiwrqOTVSPulGEox0phT2xXCQpFUEV7LYbLwSsB/fq8GoC fFehhJMQ+/BMYEbOWRsqae/CBM7VJrGcJNTxSCtxOqAPka9aBScL9v6tpCyv4DwpOo9D uq92l67KswNuN9Bmwl+TXJsjNBOTHgpF98CTRKAPLI+LWDmuzBKN5Cm489GlkIpp0X2u M6JA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=n0eKB41K; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gt11-20020a1709072d8b00b00783d5a873dcsi407778ejc.341.2022.10.13.11.35.39; Thu, 13 Oct 2022 11:36:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=n0eKB41K; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231535AbiJMS1r (ORCPT + 99 others); Thu, 13 Oct 2022 14:27:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231425AbiJMS1O (ORCPT ); Thu, 13 Oct 2022 14:27:14 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4867C18A3E6; Thu, 13 Oct 2022 11:22:57 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id E7376B8205C; Thu, 13 Oct 2022 18:00:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 46967C433D6; Thu, 13 Oct 2022 18:00:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665684011; bh=45B25suZiRTyMNLHbM6xw8qTu27E00Fp19ufaiOX5r0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n0eKB41KzVPCF2HFHjdqyG/G5mzHQcgLvAgFKzuxnwH1o2aNr4LnF10RcgSmxZYUj Z6JKaF75GNZLhiADHcZvYoLZsgGaYSMR6S9I3APJTICKB03leMHqb8KPT7/PlWuMhF 79OHev7cnV46XA3cmwhcufo6zO01VdKTVQvxcb7E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Cameron Gutman , Pavel Rojtberg , Dmitry Torokhov Subject: [PATCH 5.19 31/33] Input: xpad - fix wireless 360 controller breaking after suspend Date: Thu, 13 Oct 2022 19:53:03 +0200 Message-Id: <20221013175146.298237504@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175145.236739253@linuxfoundation.org> References: <20221013175145.236739253@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746598535988661239?= X-GMAIL-MSGID: =?utf-8?q?1746598535988661239?= From: Cameron Gutman commit a17b9841152e7f4621619902b347e2cc39c32996 upstream. 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. Cc: stable@vger.kernel.org Fixes: 4220f7db1e42 ("Input: xpad - workaround dead irq_out after suspend/ resume") Signed-off-by: Cameron Gutman Signed-off-by: Pavel Rojtberg Link: https://lore.kernel.org/r/20220818154411.510308-3-rojtberg@gmail.com Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/joystick/xpad.c | 1 - 1 file changed, 1 deletion(-) --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -1991,7 +1991,6 @@ static struct usb_driver xpad_driver = { .disconnect = xpad_disconnect, .suspend = xpad_suspend, .resume = xpad_resume, - .reset_resume = xpad_resume, .id_table = xpad_table, };