Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8438c38 authored by Bin Liu's avatar Bin Liu Committed by Greg Kroah-Hartman
Browse files

usb: phy: am335x: fix race condition in _probe 



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: 2fc711d7 ("usb: phy: am335x: Enable USB remote wakeup using PHY wakeup")
Cc: stable@vger.kernel.org # v3.18+
Signed-off-by: default avatarBin Liu <b-liu@ti.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8459f1d6

drivers/usb/phy/phy-am335x.c

+1 −4
Original line number Diff line number Diff line
@@ -61,9 +61,6 @@ static int am335x_phy_probe(struct platform_device *pdev) 
	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;
@@ -82,7 +79,7 @@ static int am335x_phy_probe(struct platform_device *pdev) 
	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)