Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1650785

[PATCH 3/3] phy: twl4030-usb: propagate actual error on regulator lookup

Show all headers | View raw

devm_regulator_get returns an error code, return this one to the caller
instead of -ENODEV. This fixes deferred probe.

Fixes: 6747caa76cab ("usb: phy: twl4030: use the new generic PHY framework")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/phy/phy-twl4030-usb.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c
index 6aefbd55fcee..422232aac0b2 100644
--- a/drivers/phy/phy-twl4030-usb.c
+++ b/drivers/phy/phy-twl4030-usb.c
@@ -499,7 +499,7 @@ static int twl4030_usb_ldo_init(struct twl4030_usb *twl)
 
 	twl->usb3v1 = devm_regulator_get(twl->dev, "usb3v1");
 	if (IS_ERR(twl->usb3v1))
-		return -ENODEV;
+		return PTR_ERR(twl->usb3v1);
 
 	twl_i2c_write_u8(TWL_MODULE_PM_RECEIVER, 0, VUSB3V1_TYPE);
 
@@ -508,7 +508,7 @@ static int twl4030_usb_ldo_init(struct twl4030_usb *twl)
 
 	twl->usb1v5 = devm_regulator_get(twl->dev, "usb1v5");
 	if (IS_ERR(twl->usb1v5))
-		return -ENODEV;
+		return PTR_ERR(twl->usb1v5);
 
 	twl_i2c_write_u8(TWL_MODULE_PM_RECEIVER, 0, VUSB1V5_TYPE);
 
@@ -517,7 +517,7 @@ static int twl4030_usb_ldo_init(struct twl4030_usb *twl)
 
 	twl->usb1v8 = devm_regulator_get(twl->dev, "usb1v8");
 	if (IS_ERR(twl->usb1v8))
-		return -ENODEV;
+		return PTR_ERR(twl->usb1v8);
 
 	twl_i2c_write_u8(TWL_MODULE_PM_RECEIVER, 0, VUSB1V8_TYPE);
 
-- 
2.11.0

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 1/3] phy: twl4030-usb: undo usb_add_phy_dev in error path Uwe Kleine-König          <u.kleine-koenig@pengutronix.de> - 2017-05-25 22:00 +0200
  [PATCH 2/3] phy: twl4030-usb: handle usb_add_phy_dev return value Uwe Kleine-König          <u.kleine-koenig@pengutronix.de> - 2017-05-25 22:00 +0200
  [PATCH 3/3] phy: twl4030-usb: propagate actual error on regulator lookup Uwe Kleine-König          <u.kleine-koenig@pengutronix.de> - 2017-05-25 22:00 +0200

csiph-web