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 A46AA3D5643; Tue, 16 Jun 2026 18:36:43 +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=1781635004; cv=none; b=bqFNhYBa3FHbW/N4nZJEUpa4W93gb4XAvTTVkkzQlVWkx710iEfirEVHJw5tc6JDJRha0U7r57Pe1zOPLbEHAFYyRm19D2RtjVHERhnLm8AfbbpS6zcTAJvGpO5gQqqOW31ONqMQ/WNBIGSm9r3sAlTdcWabr260NERiz3JgfRc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781635004; c=relaxed/simple; bh=iC1NnaoAVCOmpjpY5GO6TbAEbjL9A1bwR1ToOBE2huI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HPQ77/Np9bp8E8n2Q69mXENJHyk+ToT9AToV2NVHmM+PLXwEz8PMVXdYFgkT7abJ9ux7lIE4ZYFeGgreIgjO8FtHsg5g6+HvoT4fRehFbGfj2htwvgwC3ByW7zZVwjU1aV2qyhYLSWiA5c9xLEi+iHIMMzV/FL1tHbtzkH5J8z0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZA+kj1UI; 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="ZA+kj1UI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ADF2F1F000E9; Tue, 16 Jun 2026 18:36:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781635003; bh=Xkao8i823PXBwZrqKDA97Ltkg0oXrUylw8thIbxgwdw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZA+kj1UIvWHgB+daaDajA6JznyuesqkhIt1gHWmJVfyCMkAXYEW8Tj1Bn6VsyftDm eo3ikGtllJj4+5Yrmbn1jJxOypQFcJfFb0a6inFRKWzxeVDYAy53Cia5AmdCbUtNFp NO/mFec7v4XUTbG55lfiD2OET/g/hfP2cd08mnns= 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 5.15 373/411] usb: dwc3: xilinx: fix error handling in zynqmp init error paths Date: Tue, 16 Jun 2026 20:30:11 +0530 Message-ID: <20260616145121.141591304@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145100.376842714@linuxfoundation.org> References: <20260616145100.376842714@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 5.15-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 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) --- a/drivers/usb/dwc3/dwc3-xilinx.c +++ b/drivers/usb/dwc3/dwc3-xilinx.c @@ -165,15 +165,13 @@ static int dwc3_xlnx_init_zynqmp(struct } ret = phy_init(usb3_phy); - if (ret < 0) { - phy_exit(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*/ @@ -185,20 +183,18 @@ 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(usb3_phy); - if (ret < 0) { - phy_exit(usb3_phy); - goto err; - } + if (ret < 0) + goto err_phy_exit; skip_usb3_phy: /* @@ -212,6 +208,10 @@ skip_usb3_phy: writel(reg, priv_data->regs + XLNX_USB_TRAFFIC_ROUTE_CONFIG); } + return 0; + +err_phy_exit: + phy_exit(usb3_phy); err: return ret; }