usb: dwc3: omap: Fix devm_regulator_get_optional() error handling
Subsystems (3)
PATCH 1/1 usb: dwc3: omap: Fix devm_regulator_get_optional() error handling
Commit 533561a8aad5 ("usb: dwc3: omap: Use devm_regulator_get_optional()") assumed NULL was returned, but devm_regulator_get_optional() returns -ENODEV rather than NULL like other *_get_optional() functions.
Fixes 533561a8aad5 ("usb: dwc3: omap: Use devm_regulator_get_optional()")
Signed-off-by Rob Herring (Arm) <[email protected]>
--- drivers/usb/dwc3/dwc3-omap.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/usb/dwc3/dwc3-omap.c +5 -2
@@ -484,8 +484,11 @@ static int dwc3_omap_probe(struct platform_device *pdev)return PTR_ERR (base); vbus_reg =devm_regulator_get_optional (dev,"vbus" ); -if (IS_ERR (vbus_reg)) -return dev_err_probe (dev,PTR_ERR (vbus_reg),"vbus init failed\n" ); +if (IS_ERR (vbus_reg)) { +if (PTR_ERR (vbus_reg) != -ENODEV ) +return dev_err_probe (dev,PTR_ERR (vbus_reg),"vbus init failed\n" ); + vbus_reg =NULL ; + } omap->dev = dev; omap->irq = irq;
Signature · 1 line
2.45.2
Quoted 32 lines · Rob Herring (Arm)
Commit
533561a8aad5("usb: dwc3: omap: Usedevm_regulator_get_optional()") assumed NULL was returned, butdevm_regulator_get_optional()returns-ENODEVrather than NULL like other*_get_optional()functions.Fixes 533561a8aad5 ("usb: dwc3: omap: Use devm_regulator_get_optional()")Signed-off-by Rob Herring (Arm) <[email protected]>--- drivers/usb/dwc3/dwc3-omap.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)drivers/usb/dwc3/dwc3-omap.c +5
-2@@ -484,8 +484,11 @@ static int dwc3_omap_probe(struct platform_device *pdev)return PTR_ERR (base); vbus_reg =devm_regulator_get_optional (dev,"vbus" ); -if (IS_ERR (vbus_reg)) -return dev_err_probe (dev,PTR_ERR (vbus_reg),"vbus init failed\n" ); +if (IS_ERR (vbus_reg)) { +if (PTR_ERR (vbus_reg) != -ENODEV ) +return dev_err_probe (dev,PTR_ERR (vbus_reg),"vbus init failed\n" ); + vbus_reg =NULL ; + } omap->dev = dev; omap->irq = irq;Signature · 1 line
2.45.2
Acked-by Thinh Nguyen <[email protected]>
Thanks,
Thinh