| From a53469a68eb886e84dd8b69a1458a623d3591793 Mon Sep 17 00:00:00 2001 |
| From: Bin Liu <b-liu@ti.com> |
| Date: Wed, 16 Jan 2019 11:54:07 -0600 |
| Subject: usb: phy: am335x: fix race condition in _probe |
| |
| From: Bin Liu <b-liu@ti.com> |
| |
| commit a53469a68eb886e84dd8b69a1458a623d3591793 upstream. |
| |
| power off the phy should be done before populate the phy. Otherwise, |
| am335x_init() could be called by the phy owner to power on the phy first, |
| then am335x_phy_probe() turns off the phy again without the caller knowing |
| it. |
| |
| Fixes: 2fc711d76352 ("usb: phy: am335x: Enable USB remote wakeup using PHY wakeup") |
| Cc: stable@vger.kernel.org # v3.18+ |
| Signed-off-by: Bin Liu <b-liu@ti.com> |
| Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/phy/phy-am335x.c | 5 +---- |
| 1 file changed, 1 insertion(+), 4 deletions(-) |
| |
| --- a/drivers/usb/phy/phy-am335x.c |
| +++ b/drivers/usb/phy/phy-am335x.c |
| @@ -60,9 +60,6 @@ static int am335x_phy_probe(struct platf |
| if (ret) |
| return ret; |
| |
| - ret = usb_add_phy_dev(&am_phy->usb_phy_gen.phy); |
| - if (ret) |
| - return ret; |
| am_phy->usb_phy_gen.phy.init = am335x_init; |
| am_phy->usb_phy_gen.phy.shutdown = am335x_shutdown; |
| |
| @@ -81,7 +78,7 @@ static int am335x_phy_probe(struct platf |
| device_set_wakeup_enable(dev, false); |
| phy_ctrl_power(am_phy->phy_ctrl, am_phy->id, am_phy->dr_mode, false); |
| |
| - return 0; |
| + return usb_add_phy_dev(&am_phy->usb_phy_gen.phy); |
| } |
| |
| static int am335x_phy_remove(struct platform_device *pdev) |