From patchwork Mon Oct 24 11:29:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8569 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp418057wru; Mon, 24 Oct 2022 05:14:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4C3+l8oqoqg0mQg7ONm3vojIu5ghtR76Zy8WrC0bMW0JnpmPgqpU+T3svPggc4N6GPMABK X-Received: by 2002:a05:6402:440f:b0:45d:297b:c70a with SMTP id y15-20020a056402440f00b0045d297bc70amr30633571eda.187.1666613642940; Mon, 24 Oct 2022 05:14:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666613642; cv=none; d=google.com; s=arc-20160816; b=F3YbNlQeuM4zDh/jN12PF94rgiqQYr5HddAi//FqGygwjAHmJVQ1Rz2LaiUqmahHAZ QBvDcwjvjEDdrVCeCnCttRuccOi+ZMq7LtVYpduK/GNS4flLZazF0vwkWicgi0IXUn6L dyyEeHagXgQMDnrSlKaY1/69t5eOsg8Wbmnkl/2MLAPXGlcLplJL9EbZAU+RpGi4+eCt RlENO1+sztTKDLimUsT/AjvMt3hbmf6GH8cHT8SaC/zFSwizXm3YE5+QR+Th4vTAXIcu 8ZOQlsLakeveud4HTsozqvrPJ/bgMw9/Dc964l091ddQruMs+dKfX0yytPDEZeMvNtTh Bs4w== 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=Gxr8mCQY6U7UkJiw+EN39SxL3VWnKeqPf7o1ilywt7M=; b=Njm4HngOXPtosD6SGD3xqvpHI5R/UG9P0HynwxUodEDxtx0tQyqCaq1aWvBlkPFX3H 25hrMuNMKIo/iPrd0zqPxApU9rRo2zfpAAnl6PrKtJSI0L+K/Xu4lvCVTLrpF1jcfJa/ vnVOwAiqFjJ2h4ICS9gnSgg2SM6u0HBMh99dHFXqMK2wKolkWFLOaZNOgxK9Pqwu1SY5 DofrMLRRkRzmi3W38QPnMb+SQ9JwV1Zx4drIumc/NIr7GhyTzr6X6VCKCVCqRcXLF2fO YZlqiarFmCvCmyaIyZAg5neYoKAGMlQooZOzdqK9TPQyHw2Yy6TdRKdBSkwVDPU1CYy3 mq8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cf5tnW9j; 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 jg16-20020a170907971000b0078def5c29e6si30811598ejc.531.2022.10.24.05.13.36; Mon, 24 Oct 2022 05:14:02 -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=cf5tnW9j; 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 S232483AbiJXMFX (ORCPT + 99 others); Mon, 24 Oct 2022 08:05:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232453AbiJXMC4 (ORCPT ); Mon, 24 Oct 2022 08:02:56 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DE1B23EB0; Mon, 24 Oct 2022 04:49:46 -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 47F1EB8117E; Mon, 24 Oct 2022 11:47:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A15C2C433C1; Mon, 24 Oct 2022 11:47:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612041; bh=zZ6aCnvvIvMD/DtvvB7qbtS2ts7lyXMgsQSGtvWJf1E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cf5tnW9jl781uCuhyFZd5zBA/iLc01IIH16bwrXl164xnE4Twgm7yiLg6ot61+7w+ JsH2gcWtUFZ3hxpCuzY0Z25PLOw4nI7kM4SKeBXD5+JrWoEAmljyH6K1ZTBbGUUvWG WqRzO740Y3HgAf2D9UQb1bJcMHyRJA3yPXkcnCG8= 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.14 048/210] Input: xpad - fix wireless 360 controller breaking after suspend Date: Mon, 24 Oct 2022 13:29:25 +0200 Message-Id: <20221024112958.545652058@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@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?1747571067421729296?= X-GMAIL-MSGID: =?utf-8?q?1747571067421729296?= 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 @@ -2000,7 +2000,6 @@ static struct usb_driver xpad_driver = { .disconnect = xpad_disconnect, .suspend = xpad_suspend, .resume = xpad_resume, - .reset_resume = xpad_resume, .id_table = xpad_table, };