Patch "phy: rockchip-inno-usb2: Return zero after otg sync" has been added to the 6.0-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    phy: rockchip-inno-usb2: Return zero after otg sync

to the 6.0-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     phy-rockchip-inno-usb2-return-zero-after-otg-sync.patch
and it can be found in the queue-6.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 3330886c2775c9fe43a41bd793b4775bc5f4af81
Author: Peter Geis <pgwipeout@xxxxxxxxx>
Date:   Fri Sep 2 14:45:42 2022 -0400

    phy: rockchip-inno-usb2: Return zero after otg sync
    
    [ Upstream commit f340ed8664a55a467850ec1689996e63d9ee971a ]
    
    The otg sync state patch reuses the ret variable, but fails to set it to
    zero after use. This leads to a situation when the otg port is in
    peripheral mode where the otg phy aborts halfway through setup.  It also
    fails to account for a failure to register the extcon notifier. Fix this
    by using our own variable and skipping otg sync in case of failure.
    
    Fixes: 8dc60f8da22f ("phy: rockchip-inno-usb2: Sync initial otg state")
    Reported-by: Markus Reichl <m.reichl@xxxxxxxxxxxxx>
    Reported-by: Michael Riesch <michael.riesch@xxxxxxxxxxxxxx>
    Signed-off-by: Peter Geis <pgwipeout@xxxxxxxxx>
    Tested-by: Michael Riesch <michael.riesch@xxxxxxxxxxxxxx>
    Tested-by: Markus Reichl <m.reichl@xxxxxxxxxxxxx>
    Reviewed-by: Samuel Holland <samuel@xxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20220902184543.1234835-1-pgwipeout@xxxxxxxxx
    Signed-off-by: Vinod Koul <vkoul@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
index 0b1e9337ee8e..e6ededc51523 100644
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -1124,7 +1124,7 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy,
 					  struct rockchip_usb2phy_port *rport,
 					  struct device_node *child_np)
 {
-	int ret;
+	int ret, id;
 
 	rport->port_id = USB2PHY_PORT_OTG;
 	rport->port_cfg = &rphy->phy_cfg->port_cfgs[USB2PHY_PORT_OTG];
@@ -1162,13 +1162,15 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy,
 
 		ret = devm_extcon_register_notifier(rphy->dev, rphy->edev,
 					EXTCON_USB_HOST, &rport->event_nb);
-		if (ret)
+		if (ret) {
 			dev_err(rphy->dev, "register USB HOST notifier failed\n");
+			goto out;
+		}
 
 		if (!of_property_read_bool(rphy->dev->of_node, "extcon")) {
 			/* do initial sync of usb state */
-			ret = property_enabled(rphy->grf, &rport->port_cfg->utmi_id);
-			extcon_set_state_sync(rphy->edev, EXTCON_USB_HOST, !ret);
+			id = property_enabled(rphy->grf, &rport->port_cfg->utmi_id);
+			extcon_set_state_sync(rphy->edev, EXTCON_USB_HOST, !id);
 		}
 	}