diff options
| author | Fabio Estevam <festevam@denx.de> | 2023-10-09 10:15:35 -0300 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2023-10-16 08:46:01 +0200 |
| commit | 7478c84f3d9f84b4fa748dae222d78c9a12e25f7 (patch) | |
| tree | fc5ed40521af92b8f3a2dc8198e31f105f0eb555 /drivers | |
| parent | 2bcfae22d9f61a57f9cb8f2eb0aff79259e2c724 (diff) | |
| download | u-boot-7478c84f3d9f84b4fa748dae222d78c9a12e25f7.tar.gz u-boot-7478c84f3d9f84b4fa748dae222d78c9a12e25f7.tar.bz2 u-boot-7478c84f3d9f84b4fa748dae222d78c9a12e25f7.zip | |
usb: ehci: mxs: Use regulator_set_enable_if_allowed()
Since commit 4fcba5d556b4 ("regulator: implement basic reference
counter") the return value of regulator_set_enable() may be EALREADY or
EBUSY for fixed/GPIO regulators.
Switch to using the more relaxed regulator_set_enable_if_allowed() to
continue if regulator already was enabled or disabled.
This fixes the following error when running the 'ums' command:
=> ums 0 mmc 0
UMS: LUN 0, dev mmc 0, hwpart 0, sector 0x0, count 0xece000
Error enabling VBUS supply
g_dnl_register: failed!, error: -114
g_dnl_register failed
Signed-off-by: Fabio Estevam <festevam@denx.de>
Reviewed-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/host/ehci-mxs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/host/ehci-mxs.c b/drivers/usb/host/ehci-mxs.c index 092c79fd4b..ddf7cc2d00 100644 --- a/drivers/usb/host/ehci-mxs.c +++ b/drivers/usb/host/ehci-mxs.c @@ -236,9 +236,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; @@ -265,7 +265,7 @@ static int ehci_usb_remove(struct udevice *dev) #if CONFIG_IS_ENABLED(DM_REGULATOR) if (priv->vbus_supply) { - ret = regulator_set_enable(priv->vbus_supply, false); + ret = regulator_set_enable_if_allowed(priv->vbus_supply, false); if (ret) { puts("Error disabling VBUS supply\n"); return ret; |