From patchwork Mon Oct 24 11:29:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8735 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp423945wru; Mon, 24 Oct 2022 05:26:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6cmeqbFaA0nO99Gy+hoPFW2KmH3rz+aUf2o9o8jdS4XzWjhF+A8GOGK8b+D6sMGYwETOHp X-Received: by 2002:a05:6a00:2384:b0:566:813c:ae24 with SMTP id f4-20020a056a00238400b00566813cae24mr33410572pfc.17.1666614373986; Mon, 24 Oct 2022 05:26:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666614373; cv=none; d=google.com; s=arc-20160816; b=EM1a7+sRbVTvCLAiVT7uPBAAYCf7U61cHwK+H5NSmAMwZiLAGs+t0M0RE0Tsh/vwQD p0AZUUhN1YzFoGQ+CJ3HRqqwyHyu2ljXGR6JEQTidZyxfvp8H5freQ9Vy3gJ61lFOMb0 jH2TTbCaCxxSY/mq2YfGwZL9hn/lBgytDdH4Tcjuw8ckarD2B+to8i07TKrsfI+7/4Nj yDbeD7YBbbSN9Ky0OHqA4UJPm3TkHu+FMkCGlfYWdAAdBTeSa4KZEfJ1yoxROMYst2Sp EKDyQWjdiOpdcbZ4AYWucUNb/XIZdajmxAAlXIEB5KI/UnfEgWMR2cu4wp6a6sT7ENBR lW3g== 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=zda8vrA8qy/s3uMGDlMQxf3Cs3PEBS/mp2MMjyuA0rw=; b=02t1rZptsAUukwIPK9N4f1iEvkg2Lm2htyK/hZ/iT6hueyBMCVj0wfx1hwe5d5Ra0D eN/me4bxalHfKrrkDTsxJw41sSDahwtZyk4izYrP1/rAuKjy1dvtUuTxIKoa/Wmponh+ u/GQz4/E43OxvhHmR9qaQSvUL8GMx7M1ZmSnijmc7DRN2gT/ymInyPA184cozfJBCJIk 8+jprhe9H2DDdUMxP98f+/vNdQjj0iK+n9g04GiG6tWcjn8TeZNd6GMbSFLT3qRuRN4u riyIXa18RI9UKwkw6nu6RhEJC0ErsDEx7TN0TXjeRCmCnc0wDb6GIbZTQZoN6a9q141/ Q8yg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=nyTKwyOg; 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 p2-20020a170902b08200b00180556e1b6bsi32267025plr.609.2022.10.24.05.26.00; Mon, 24 Oct 2022 05:26:13 -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=nyTKwyOg; 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 S230494AbiJXMZh (ORCPT + 99 others); Mon, 24 Oct 2022 08:25:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233674AbiJXMYC (ORCPT ); Mon, 24 Oct 2022 08:24:02 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C7732D772; Mon, 24 Oct 2022 04:59:59 -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 1320CB811D2; Mon, 24 Oct 2022 11:55:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60B3AC433C1; Mon, 24 Oct 2022 11:55:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612552; bh=VMRx9wwHDaT/MiBy+1sQ0ULWsCHQy9lDoV0BLn6XwFo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nyTKwyOgbjQpsUVQ7A7Ii3XP5K80AFrkSc7bqnVJ/OrZ+D4kyGvaXslbAjju8Io+O L7cH9oUdFhr4urG98Bj7l9ldsyYfTSEU/pcoNlj5ivlssXVgdSibqN5HM3YPbm3Lm7 xXR2hL1opmvTNXuXOU+NzTbi61tSgQFHeYNlku9A= 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 4.19 031/229] Input: xpad - fix wireless 360 controller breaking after suspend Date: Mon, 24 Oct 2022 13:29:10 +0200 Message-Id: <20221024113000.128741561@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112959.085534368@linuxfoundation.org> References: <20221024112959.085534368@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 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?1747571833734646915?= X-GMAIL-MSGID: =?utf-8?q?1747571833734646915?= 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 @@ -1997,7 +1997,6 @@ static struct usb_driver xpad_driver = { .disconnect = xpad_disconnect, .suspend = xpad_suspend, .resume = xpad_resume, - .reset_resume = xpad_resume, .id_table = xpad_table, };