From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 328E936F8E7; Sun, 7 Jun 2026 11:00:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780830047; cv=none; b=dH7CrOyF7J93OoxQhHAblK6ROTrun/wUSO9r4GI5sWz2OHsr8pS70lCAp/BIzE5j3aCdqQAaBTSTLdG6fBNlmDksoF3XU69lK532fENpzkPY6li6iHg/TIYx+pGIQ282VvJTTT2nk9Tc1WjqST4VddIqty8HxSPjEmhDaBflNEA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780830047; c=relaxed/simple; bh=7Is6Ikp221plxNJ4kzFhEPMYYu8H0NRCWRvdXP2Dw0w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tBsdxSQV2r0pJ3iD1503yVMfuYXCnyi1WhGnI4ttz26OXy31zVVaI7cCDqX/3U0Px4uLBhsZaMZgwrLxb9G9xPqFt3nJ3sgoWv6OLn5hXFIFfZEY8iKlJcREMPLDgBHTedGNUOy9b7eUd+EK28cDBPEVJSFH6Xh3ratY2p26LLs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ApMcfANS; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ApMcfANS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 478D11F00893; Sun, 7 Jun 2026 11:00:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780830046; bh=/pjqmAq60cEp13N68N/Sjk8/DV1aNyVMY4Zyq9EZPSE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ApMcfANSOaOP8YVKcuGkU1pcrZX5nDb7xJv0qKM1no7goiHdlaAJh4iQaZD3xk7TT 0wLC8LrvnK77/1CuPng6WrnV7y5WrZGoogqS1wVwvz0ik3BNqNzBpKup4DMHcbEFb3 peSzNQ101dA38roKSYRgWjhHuw06Ps6mQQ8f44Zc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Thinh Nguyen , Radhey Shyam Pandey , Sasha Levin Subject: [PATCH 6.18 303/315] usb: dwc3: xilinx: fix error handling in zynqmp init error paths Date: Sun, 7 Jun 2026 12:01:30 +0200 Message-ID: <20260607095738.727629876@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260607095727.528828913@linuxfoundation.org> References: <20260607095727.528828913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Radhey Shyam Pandey [ Upstream commit c1a0ecbf32c4b397353204e2ec94c5bb9f3300ed ] Fix error handling and resource cleanup i.e remove invalid phy_exit() after failed phy_init(), route failures through proper cleanup paths and return 0 explicitly on success. Fixes: 84770f028fab ("usb: dwc3: Add driver for Xilinx platforms") Cc: stable@vger.kernel.org Acked-by: Thinh Nguyen Signed-off-by: Radhey Shyam Pandey Link: https://patch.msgid.link/20260519115529.2980421-1-radhey.shyam.pandey@amd.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/usb/dwc3/dwc3-xilinx.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) --- a/drivers/usb/dwc3/dwc3-xilinx.c +++ b/drivers/usb/dwc3/dwc3-xilinx.c @@ -190,15 +190,13 @@ static int dwc3_xlnx_init_zynqmp(struct } ret = phy_init(priv_data->usb3_phy); - if (ret < 0) { - phy_exit(priv_data->usb3_phy); + if (ret < 0) goto err; - } ret = reset_control_deassert(apbrst); if (ret < 0) { dev_err(dev, "Failed to release APB reset\n"); - goto err; + goto err_phy_exit; } /* Set PIPE Power Present signal in FPD Power Present Register*/ @@ -210,27 +208,25 @@ static int dwc3_xlnx_init_zynqmp(struct ret = reset_control_deassert(crst); if (ret < 0) { dev_err(dev, "Failed to release core reset\n"); - goto err; + goto err_phy_exit; } ret = reset_control_deassert(hibrst); if (ret < 0) { dev_err(dev, "Failed to release hibernation reset\n"); - goto err; + goto err_phy_exit; } ret = phy_power_on(priv_data->usb3_phy); - if (ret < 0) { - phy_exit(priv_data->usb3_phy); - goto err; - } + if (ret < 0) + goto err_phy_exit; skip_usb3_phy: /* ulpi reset via gpio-modepin or gpio-framework driver */ reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); if (IS_ERR(reset_gpio)) { - return dev_err_probe(dev, PTR_ERR(reset_gpio), - "Failed to request reset GPIO\n"); + ret = PTR_ERR(reset_gpio); + goto err_phy_power_off; } if (reset_gpio) { @@ -240,6 +236,13 @@ skip_usb3_phy: } dwc3_xlnx_set_coherency(priv_data, XLNX_USB_TRAFFIC_ROUTE_CONFIG); + + return 0; + +err_phy_power_off: + phy_power_off(priv_data->usb3_phy); +err_phy_exit: + phy_exit(priv_data->usb3_phy); err: return ret; }