Skip to contentSkip to conversation

usb: misc: onboard_usb_hub: Disable the USB hub clock on failure

PATCH New Fabio Estevam 1 participant 1 message Apr 9, 2024 USB

lore
Share & tools
lore

Fabio Estevam

author
#0 lore raw

PATCH v2 1/1 usb: misc: onboard_usb_hub: Disable the USB hub clock on failure

From: Fabio Estevam <[email protected]>

In case regulator_bulk_enable() fails, the previously enabled USB hub clock should be disabled.

Fix it accordingly.

Fixes 65e62b8a955a ("usb: misc: onboard_usb_hub: Add support for clock input")
Signed-off-by Fabio Estevam <[email protected]>
Reviewed-by Frieder Schrempf <[email protected]>
Acked-by Matthias Kaehlcke <[email protected]>

---
Changes since v1:
- Rebased against 6.9-rc2.
- Collected tags.

 drivers/usb/misc/onboard_usb_hub.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/usb/misc/onboard_usb_hub.c +5 -1
index c6101ed2d9d4..d8049275a023 100644
@@ -78,7 +78,7 @@ static int onboard_hub_power_on(struct onboard_hub *hub)
 	err = regulator_bulk_enable(hub->pdata->num_supplies, hub->supplies);
 	if (err) {
 		dev_err(hub->dev, "failed to enable supplies: %pe\n", ERR_PTR(err));
-		return err;
+		goto disable_clk;
 	}
 
 	fsleep(hub->pdata->reset_us);

@@ -87,6 +87,10 @@ static int onboard_hub_power_on(struct onboard_hub *hub)
 	hub->is_powered_on = true;
 
 	return 0;
+
+disable_clk:
+	clk_disable_unprepare(hub->clk);
+	return err;
 }
 
 static int onboard_hub_power_off(struct onboard_hub *hub)
Signature · 1 line
2.34.1