From patchwork Mon Oct 24 11:29:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8611 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp419847wru; Mon, 24 Oct 2022 05:17:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6/mpa2g24mMMKWEp54Z4a9vZaKMYKoq4Gc1o1Cm3mJy6fWehSUbTYaHy8gGmlylG5HJel5 X-Received: by 2002:a17:902:b708:b0:184:3921:df30 with SMTP id d8-20020a170902b70800b001843921df30mr33663250pls.43.1666613824521; Mon, 24 Oct 2022 05:17:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666613824; cv=none; d=google.com; s=arc-20160816; b=nGbAoMGyP9KaEn+KfG1Jz0iidQXDsVR54okASU4aRLVWWqFnqhNsi9okz3tFjYFmYx VvkIgQHTAtlSE6fGtaXBsn8BjpwcGYbxgb76vUOJ9eD0vat9RRY/loTAILi08Cae3W6v uDfJmxt+M4cRYEtAQgMAtTNytei6pKR3Y2oM9KOIlnTPw1sTctH88kC55VWeYg2uzYay Ne1DYXSbmXSsf3hL/3uiKHmWfcZvjLKBCaaMZ8i0YO+DSYBa+7jjUjlhOet1VIZeW6F4 uprRKELtocisYPNdD22frGn47uq42gRU2SY3KDgMoiEyj98Vbd8u+3FD4vS5L/imekHm 4xvQ== 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=yQpyC0Ssz6vd4LD3YMPHOVntQcd3OJgh4dwFtZ71mleKxgoBmJm9MZUzOWm/sXmz8t VX+b7RbaB537hSCM/RfTla+Qyv7Sp41hD4C7V2W9LOleQaeGpzyv+KBCgW5paTK94tIr eYe7fho/vNPDOFBLuh92bkjzBvLooM+3pR9/L7+8eZCbrp4YDdytS2JcIl5SI/uRhzNZ pp/6I1SGdRfeBrRUTxPNnl4z0MgktQeGEqL283iJ78DGdwcQvGxUZ0O3hSw5xOICEzlC V7imidoqY5cJtLygaArSXURU6nKGzGIyOrSVvWdh/bgQujc6RAeOyFciClDipmquRwQ/ o4sQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gmWnYtn0; 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 b6-20020a170903228600b0017f75ce8a2esi38313101plh.575.2022.10.24.05.16.51; Mon, 24 Oct 2022 05:17: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=gmWnYtn0; 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 S232758AbiJXMKY (ORCPT + 99 others); Mon, 24 Oct 2022 08:10:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232844AbiJXMJB (ORCPT ); Mon, 24 Oct 2022 08:09:01 -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 B2F3F7F0AF; Mon, 24 Oct 2022 04:52:22 -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 C659DB81158; Mon, 24 Oct 2022 11:40:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 217F2C433B5; Mon, 24 Oct 2022 11:39:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666611599; bh=zZ6aCnvvIvMD/DtvvB7qbtS2ts7lyXMgsQSGtvWJf1E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gmWnYtn0ST9o0YnFnkXzaZkOExg/nW9Tkkzkv0Njy4gCwcKGrcji0oUAQRlcBYfCw WhVhf65pAnYPSO7sdx9/vY+vIISZGYTX2Ot0RclNpbnfMRSD6O0qvgJWCnf1F2Kwom JgpyqqaHPLnouoMsXa4YfQKJ+/HJNKt4iEkyFFvY= 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.9 039/159] Input: xpad - fix wireless 360 controller breaking after suspend Date: Mon, 24 Oct 2022 13:29:53 +0200 Message-Id: <20221024112950.808880388@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112949.358278806@linuxfoundation.org> References: <20221024112949.358278806@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?1747571257656663425?= X-GMAIL-MSGID: =?utf-8?q?1747571257656663425?= 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, };