With the commit 4fcba5d556b4 ("regulator: implement basic reference
counter") the return value of regulator_set_enable may be EALREADY or
EBUSY for fixed/gpio regulators.

Change to use the more relaxed regulator_set_enable_if_allowed to
continue if regulator already was enabled or disabled.

Based on 335799b7252a ("usb: dwc2: Use regulator_set_enable_if_allowed")

Signed-off-by: Marek Vasut <[email protected]>
---
Cc: Alice Guo <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Mathieu Othacehe <[email protected]>
Cc: Mattijs Korpershoek <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: [email protected]
---
 drivers/usb/host/ehci-mx5.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/host/ehci-mx5.c b/drivers/usb/host/ehci-mx5.c
index d8f521befe1..1392d29bc13 100644
--- a/drivers/usb/host/ehci-mx5.c
+++ b/drivers/usb/host/ehci-mx5.c
@@ -287,9 +287,9 @@ static int ehci_usb_probe(struct udevice *dev)
                debug("%s: No vbus supply\n", dev->name);
 
        if (!ret && priv->vbus_supply) {
-               ret = regulator_set_enable(priv->vbus_supply,
-                                          (type == USB_INIT_DEVICE) ?
-                                          false : true);
+               ret = regulator_set_enable_if_allowed(priv->vbus_supply,
+                                                     (type == USB_INIT_DEVICE) 
?
+                                                     false : true);
                if (ret) {
                        puts("Error enabling VBUS supply\n");
                        return ret;
-- 
2.45.2

Reply via email to