From patchwork Thu Oct 13 17:52:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2167 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp406164wrs; Thu, 13 Oct 2022 11:00:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7IXaRzr77ot4A1WiLDGa9sTpGhn6dWqUtUI+pVFBC436vgYrXRwJzfyxY+LH+WeeyW/DFC X-Received: by 2002:a17:907:782:b0:740:7120:c6e7 with SMTP id xd2-20020a170907078200b007407120c6e7mr682151ejb.313.1665684003897; Thu, 13 Oct 2022 11:00:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665684003; cv=none; d=google.com; s=arc-20160816; b=tljgPR/MbHc/HA5+fb7Uw37ee2XbnBm46fZIHl1FgiJj+hE28moybHCyMtYc7th5M3 UdUTALFg7CoTPONOepw4XmkvgOK0fr9tei9jr0Z3NdaMnWnb43lYBIpSHdsKoiSlX5MJ +kuSBeLJswy4a6tTgE0tiza0VVUJLFN1pAkFyXykwtScGi5fQfyI7eIEPHawVsJdcN/e hMGbvBelMKQ0xkoBPn85jjn+RxcC2wIXfYBWjhpa9rjwNoIf+zvBRvU1IaJAvDSsuZwk XCSgwQZPPAfSrQNV7LC3oCkQG3l0sgHLo++91hcrxVfRaVX/7Eyr+hUVTtHA039Pvvve ZokQ== 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=tCD3gk8VuXfqTFHUEjR9yn+YiPr4skTXWsaoD5WM/8k=; b=wk2bhqkyxAuZxEa3O7Iu58kPvuS6ohzrxXeW8X7wYO52URinPArVs7kY72N+HPaWD2 VEiK+4vV67hVoNZwFuMJ534VYBabpQauwsysSpn2bD0HnwXcVNldGuV+XMkmxW4aOfzE EX3ZNMif+jkvZSFXVyEb8hGVuuaCU8/RXBLtuxHu5e0jdMI2EBhT8pV2MyeAGUVGKAyN rAqedfXAtd6+HUkYYe7/IsIBxpdYqKxnvJNn7ZhkC4vA5TJ9dnATaM6Ik+gcv65szLPF xH9m0Ly6hZrAiQvz+ZqA98I17InI2ZbavkxL1sk4d6rwvk6lycorkxqnDa+LgDwyA8Ul Ow6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=l47JbG5f; 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 l15-20020a170906794f00b0078333d9f17bsi327443ejo.819.2022.10.13.10.59.38; Thu, 13 Oct 2022 11:00:03 -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=l47JbG5f; 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 S230304AbiJMR6i (ORCPT + 99 others); Thu, 13 Oct 2022 13:58:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229648AbiJMR5k (ORCPT ); Thu, 13 Oct 2022 13:57:40 -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 0220B153805; Thu, 13 Oct 2022 10:56:39 -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 7AF41B82023; Thu, 13 Oct 2022 17:56:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75C28C433D6; Thu, 13 Oct 2022 17:56:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665683794; bh=MzYrXWVhulBt0LKl5EA0jZy1lD1nBI6+XYc3cUJlyAc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l47JbG5fStsfv/Wq5vNgNxAR/OJusfvZDDl38rouhGsZWRRWfl9Gu+esq5t7EEQek Gyrxqgr1u8ks324aj0ZY9Yl6R9DSJeqMRjFi2V+VmmDHI+LCW1DqdpeEwKd/HNQXj3 O/fUsgVR+DDweCUWuGRGKZ7SBVCdW94C1CmTQl9Y= 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.10 52/54] Input: xpad - fix wireless 360 controller breaking after suspend Date: Thu, 13 Oct 2022 19:52:46 +0200 Message-Id: <20221013175148.591184388@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175147.337501757@linuxfoundation.org> References: <20221013175147.337501757@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?1746596270161497982?= X-GMAIL-MSGID: =?utf-8?q?1746596270161497982?= 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 @@ -1983,7 +1983,6 @@ static struct usb_driver xpad_driver = { .disconnect = xpad_disconnect, .suspend = xpad_suspend, .resume = xpad_resume, - .reset_resume = xpad_resume, .id_table = xpad_table, };