projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6c0df50
)
phy: tegra: xusb: Add missing tegra_xusb_port_unregister for usb2_port and ulpi_port
author
Gaosheng Cui
<cuigaosheng1@huawei.com>
Tue, 29 Nov 2022 11:16:34 +0000
(19:16 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 11 May 2023 14:03:37 +0000
(23:03 +0900)
[ Upstream commit
e024854048e733391b31fe5a398704b31b9af803
]
The tegra_xusb_port_unregister should be called when usb2_port
and ulpi_port map fails in tegra_xusb_add_usb2_port() or in
tegra_xusb_add_ulpi_port(), fix it.
Fixes:
53d2a715c240
("phy: Add Tegra XUSB pad controller support")
Signed-off-by: Gaosheng Cui <cuigaosheng1@huawei.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Link:
https://lore.kernel.org/r/20221129111634.1547747-1-cuigaosheng1@huawei.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/phy/tegra/xusb.c
patch
|
blob
|
history
diff --git
a/drivers/phy/tegra/xusb.c
b/drivers/phy/tegra/xusb.c
index
dce45fb
..
ce14645
100644
(file)
--- a/
drivers/phy/tegra/xusb.c
+++ b/
drivers/phy/tegra/xusb.c
@@
-782,6
+782,7
@@
static int tegra_xusb_add_usb2_port(struct tegra_xusb_padctl *padctl,
usb2->base.lane = usb2->base.ops->map(&usb2->base);
if (IS_ERR(usb2->base.lane)) {
err = PTR_ERR(usb2->base.lane);
+ tegra_xusb_port_unregister(&usb2->base);
goto out;
}
@@
-848,6
+849,7
@@
static int tegra_xusb_add_ulpi_port(struct tegra_xusb_padctl *padctl,
ulpi->base.lane = ulpi->base.ops->map(&ulpi->base);
if (IS_ERR(ulpi->base.lane)) {
err = PTR_ERR(ulpi->base.lane);
+ tegra_xusb_port_unregister(&ulpi->base);
goto out;
}