Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp5999233pxb; Mon, 14 Feb 2022 12:46:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJx14g4cx+19Xo8azmMRbB8Q7gsF5lzmpGGa3HI4NhMGDpBp9IvfcZXMrNYp3jgNf2t6roFo X-Received: by 2002:a17:902:d512:: with SMTP id b18mr660806plg.54.1644871608957; Mon, 14 Feb 2022 12:46:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644871608; cv=none; d=google.com; s=arc-20160816; b=QK4xQLRj1JrOLUPUo+fTxoyZF1OZRayR1e4bX4qsJJCc8yP348CNV82XqV3a+Q1Eyd 6GqHtZneZ14HtAdXUFl4jitS6wxwyuFroCzpGAmgxyPWto7a0UFmGmB4v/TnJWkFLLDK KLzR1s3jRIRpzALkfT+PlSh/GrGbbunzCT5KDyLFlYVNKOEOKwuIKSUSJ9NnXaPkTtmt eGJLyw01uJ0VdjbUXhkwDNvri/+UXdcFr2FmXEIhc1RNawxeo9CZc+Ej8HuoKaNX9vyE q5f97C9e/jPM14rGTDp21cluQMuAGw9cQulltxv3CUZx7wvfzUr7lnLW6erxGxn3ve1e JqRw== 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=a1yR5Bsdp5t069yYozAc16HWCXCZYi4N8Nb/Ae3HDzY=; b=MN7Qz1s25Gwh2LCQt9I6sL5Lt19xmUrr0h2pPWdIUmv1JDDsU7THjH0aGk7l3ayQK9 h/1eoFt3U2YswzPqrkRR9Papkpc0Jl0k2NXQ82Aub9I+5C9hnOFrYhS3SCG56UE8uIzw IlxrEB5KtQenUGQyTu2bir/g8Dq5wZhZ0JLj1t6FwMqICb0/xowDN0HsUr7mQBLoqdVN qjD4A76sd3HybD7tpq1TV5vbuMDXVef53MhH8bQXz0vBfAKqGU+9RbRFCuyampICgdpL aBQ9jQhaeoK4eWRCrV//z0yPL3oglAFi9tTTf5AxbK3cJ8Gk0pRq4kmTh/+XweELqJv9 6qDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iDo2sk75; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id c17si782529pgw.574.2022.02.14.12.46.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Feb 2022 12:46:48 -0800 (PST) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iDo2sk75; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 44655164D1C; Mon, 14 Feb 2022 12:12:46 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343801AbiBNJzL (ORCPT + 99 others); Mon, 14 Feb 2022 04:55:11 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:60934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344537AbiBNJvs (ORCPT ); Mon, 14 Feb 2022 04:51:48 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C5D366FBD; Mon, 14 Feb 2022 01:42:59 -0800 (PST) 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 C8F72B80DC9; Mon, 14 Feb 2022 09:42:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E650AC340EF; Mon, 14 Feb 2022 09:42:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1644831776; bh=2bxlapIbZ7DOSdflx2EZloe76yIzRk8iWg3zk2A8E8w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iDo2sk7567eAoMNYurRD6EAveASgk8R6mvl5yrpuBDq3OIAnuMQeyQ+Lvy+5Ndp1J gWmFFbcRL3w0ZcskFTGFt91E1PG4m3z+R/z/dQxzttLGOZuthPyEO2FxhPhVyIqdhK McyaLOie/H3qO8Fp7byyJCMUBeHsGpTfkVbIgTkA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, kernel test robot , stable@kernel.org, Amelie Delaunay , Minas Harutyunyan , Fabrice Gasnier Subject: [PATCH 5.10 092/116] Revert "usb: dwc2: drd: fix soft connect when gadget is unconfigured" Date: Mon, 14 Feb 2022 10:26:31 +0100 Message-Id: <20220214092501.943849604@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220214092458.668376521@linuxfoundation.org> References: <20220214092458.668376521@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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 From: Greg Kroah-Hartman commit 736e8d89044c1c330967fb938fa766cd9e0d8af0 upstream. This reverts commit 269cbcf7b72de6f0016806d4a0cec1d689b55a87. It causes build errors as reported by the kernel test robot. Link: https://lore.kernel.org/r/202202112236.AwoOTtHO-lkp@intel.com Reported-by: kernel test robot Fixes: 269cbcf7b72d ("usb: dwc2: drd: fix soft connect when gadget is unconfigured") Cc: stable@kernel.org Cc: Amelie Delaunay Cc: Minas Harutyunyan Cc: Fabrice Gasnier Signed-off-by: Greg Kroah-Hartman --- drivers/usb/dwc2/drd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/drivers/usb/dwc2/drd.c +++ b/drivers/usb/dwc2/drd.c @@ -109,10 +109,8 @@ static int dwc2_drd_role_sw_set(struct u already = dwc2_ovr_avalid(hsotg, true); } else if (role == USB_ROLE_DEVICE) { already = dwc2_ovr_bvalid(hsotg, true); - if (hsotg->enabled) { - /* This clear DCTL.SFTDISCON bit */ - dwc2_hsotg_core_connect(hsotg); - } + /* This clear DCTL.SFTDISCON bit */ + dwc2_hsotg_core_connect(hsotg); } else { if (dwc2_is_device_mode(hsotg)) { if (!dwc2_ovr_bvalid(hsotg, false))