Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp6015853pxb; Mon, 14 Feb 2022 13:11:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJy5aJksi23cqMvEDW21eYLgXH0D2V6oV2jyHjcwjARlzi1ks20i4BSy3p21Gdzv46SN7HyS X-Received: by 2002:a63:e04a:: with SMTP id n10mr755026pgj.487.1644873099979; Mon, 14 Feb 2022 13:11:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644873099; cv=none; d=google.com; s=arc-20160816; b=HTZ9+hp5vtLjXnkHZ3xi60BgyjX+KUEfrebeYPlBrQpMdwzYCGt8rSKjBEayBsFsin ++Yn6qC68HKFlQv70jqxq+r9bO9r7NXkKcWfCpmwjRvkTz8FGbY4thwXPma4jtJ6Ffo4 /KjD+eVo1tRbNiH3zKPr74utlx2zkNSdSVJTUwDWNoveFrxkjIPvCGFzOULdU7FgrZaA 2NnRsTnTISEblbbT0RR4VtlCSwXffgA70YQr7d7+b0ITRegUu0NmvKg3rYHYo8ObdIk+ OeZNsF25ixVAk7e5BDDRNV1xqh0YBcEJuBw/ooFlPvKbf011/+angANtc77h1E8F+ZrE /hHA== 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=Db/8HI+FZW+U3fMVgHVsquHlYwWRuHg1Oi5ApJ5CGdM/EQX9bIWnW6smDU2Cwccdoj ZLV4V9L+Jj/hhifLeldYLFiKreFVGzpTyRtryazovWLERys1Bl2umq7rhxd8R4qfsJc5 iuHO3lxN25mDO5hm0CtIGu/yJ8XbAvrZo87IShZzgbDPCm0EU/8pPfFg2+M6pFN0F0Qc 5ng9NNyGqbLUGHF1jSgcuaB/dXcNyBDm6HqS4EWM/qX69NZHnzJ5Y6W7GmNrqee7zKmE PMyEBnel3lmW0mBrLPziehPZNIuyHklzVDiAotM59AbiUX8JwjrSz4u0ZTnYif+hD+az TcIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Q8EFZldf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id j13si14247272plx.549.2022.02.14.13.11.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Feb 2022 13:11:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Q8EFZldf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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 298C1213938; Mon, 14 Feb 2022 12:31:19 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346754AbiBNKUl (ORCPT + 99 others); Mon, 14 Feb 2022 05:20:41 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:44754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346914AbiBNKQM (ORCPT ); Mon, 14 Feb 2022 05:16:12 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A72557B57C; Mon, 14 Feb 2022 01:53:25 -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 dfw.source.kernel.org (Postfix) with ESMTPS id CCE9D60F25; Mon, 14 Feb 2022 09:53:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94FBEC340E9; Mon, 14 Feb 2022 09:53:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1644832389; bh=2bxlapIbZ7DOSdflx2EZloe76yIzRk8iWg3zk2A8E8w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q8EFZldfW3N1MEzcjbzfmit8NVZJIqxR3OeCVZb8ZAa6oFH4fl2nHz7h2bcAXl2Li Q7pvBNx2hBS16FON+ILnOEUIudHS+7HNqLydJ06KWVtgrzWIkkEECAzYH0GiBqqVDK W93SVGtMk62XNarJGf2flhCYwBJJ4cBRKSKrHjds= 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.15 139/172] Revert "usb: dwc2: drd: fix soft connect when gadget is unconfigured" Date: Mon, 14 Feb 2022 10:26:37 +0100 Message-Id: <20220214092511.203292225@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220214092506.354292783@linuxfoundation.org> References: <20220214092506.354292783@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))