From patchwork Thu Oct 13 17:53: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: 2238 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp412858wrs; Thu, 13 Oct 2022 11:11:47 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6tF04pwZnpnTD3Z+faFRw9PE1LtiFmFx09T45YXVFzjemRGd4pX27Atmmy3BJG/kBmIFlT X-Received: by 2002:a17:90b:4d0d:b0:1fb:a86d:e752 with SMTP id mw13-20020a17090b4d0d00b001fba86de752mr1142490pjb.120.1665684707522; Thu, 13 Oct 2022 11:11:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665684707; cv=none; d=google.com; s=arc-20160816; b=GbDYlKqVDCnpV5cS4ILpaZqRFczF842IR3VTcKqTlhtsnqCJJZzJBV2TTry6Px/8sl luJE+GuRB6TtyltklwGojz/REB6Qje1T9FdsD1RNZPoNWfcoXl0PhoMzwaOEiLqN6QiT AoLfvVS5O0mAmqSnfyrYI82SYbHF38ub2pfIrLASY0pjLS/n6bL6Zy7S23tXGO929uqR kV3q+4coIqyNDEln71ea4YnMt+fNCmJGqac6FFBnLo5TaU5LbRUOqfzUIOFwE3Fw1kWJ A09QBVUzO52lrO/1Bg7QDinA73fgZ1erB4O7a1MgTc3Hi3dgsGtNP9xUyQ7I30HnT/8m Q54w== 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=lIvb2HjEeYdLuAG+nbkwdQSBAFpeMwTDQ5j7ozcstUA2Z+2744+t7+soYios9NUZWj n20R7G64xMSWU1bHLk0w78OWEpw/vvlHZOx4AIxGkW92puLEuTvYGFq881dVIEcfV15R HJveH08i8PsMg/5nwtxuyq4L2LBjSwkfgpqwv/HZnE4gUKisYx1Ubmnbc3polhpxRVbA 5zhbkrYbGVoIw6yPx6Og598LMNyxNtP4WcM1bQR+YATYqx5MWBzzw6Ra/m0fYvolpUh/ eodltHj2pWtpfjrQ6fXn51p2mNdSZfs/c6T498r6WVq72sThJAVK7o7AbuNJpSW6qK7i 8vqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=K9ObPneC; 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 n1-20020a170902e54100b001786a4a4c98si393440plf.371.2022.10.13.11.11.34; Thu, 13 Oct 2022 11:11:47 -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=K9ObPneC; 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 S231206AbiJMSLT (ORCPT + 99 others); Thu, 13 Oct 2022 14:11:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231290AbiJMSKd (ORCPT ); Thu, 13 Oct 2022 14:10:33 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F830169CF2; Thu, 13 Oct 2022 11:07:49 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 995EF61A53; Thu, 13 Oct 2022 18:02:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA87CC433C1; Thu, 13 Oct 2022 18:02:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665684143; bh=45B25suZiRTyMNLHbM6xw8qTu27E00Fp19ufaiOX5r0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K9ObPneC3kJY+RKF3jCOVPjZKul9jtb+dHFXU/iOILWryCld8FgVVs2qSRyVxrr7R Ev/2f2JfaOGiKXnT/LqWrU61eDd2D8Ldj7HlCf6ENH653VPYAWNE+3T/cxzQc/lM7p Lv3FJAE5MlV3laVZ4nDnzF0ia/b4xKTbw8JibSiY= 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 6.0 32/34] Input: xpad - fix wireless 360 controller breaking after suspend Date: Thu, 13 Oct 2022 19:53:10 +0200 Message-Id: <20221013175147.341436627@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175146.507746257@linuxfoundation.org> References: <20221013175146.507746257@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?1746597008159331834?= X-GMAIL-MSGID: =?utf-8?q?1746597008159331834?= 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, };