Skip to contentSkip to conversation

regulator: lp87565: Fix probe failure for "ti,lp87565"

PATCH RESEND New Axel Lin 1 participant 1 message Jul 24, 2019 Voltage and current regulator framework

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH RESEND 1/1 regulator: lp87565: Fix probe failure for "ti,lp87565"

The "ti,lp87565" compatible string is still in of_lp87565_match_table, but current code will return -EINVAL because lp87565->dev_type is unknown. This was working in earlier kernel versions, so fix it.

Fixes 7ee63bd74750 ("regulator: lp87565: Add 4-phase lp87561 regulator support")

---
This patch was sent on https://lkml.org/lkml/2019/7/11/203
This resend re-generate the patch against regulator tree for-5.3 branch.

Note there is a conflict with commit f3f4363b1239 on Linus' tree which is merged from mfd tree. ("regulator: lp87565: Fix missing break in switch statement")

 drivers/regulator/lp87565-regulator.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/regulator/lp87565-regulator.c +5 -4
index 993c11702083..0c440c5e2832 100644
@@ -163,7 +163,7 @@ static int lp87565_regulator_probe(struct platform_device *pdev)
 	struct lp87565 *lp87565 = dev_get_drvdata(pdev->dev.parent);
 	struct regulator_config config = { };
 	struct regulator_dev *rdev;
-	int i, min_idx = LP87565_BUCK_0, max_idx = LP87565_BUCK_3;
+	int i, min_idx, max_idx;
 
 	platform_set_drvdata(pdev, lp87565);
 
@@ -180,10 +180,11 @@ static int lp87565_regulator_probe(struct platform_device *pdev)
 	case LP87565_DEVICE_TYPE_LP87561_Q1:
 		min_idx = LP87565_BUCK_3210;
 		max_idx = LP87565_BUCK_3210;
+		break;
 	default:
-		dev_err(lp87565->dev, "Invalid lp config %d\n",
-			lp87565->dev_type);
-		return -EINVAL;
+		min_idx = LP87565_BUCK_0;
+		max_idx = LP87565_BUCK_3;
+		break;
 	}
 
 	for (i = min_idx; i <= max_idx; i++) {
Signature · 1 line
2.20.1