Merge remote-tracking branch 'regulator/fix/da9063' into regulator-linus

70c97e3b · Mark Brown · 009d0431 · 8ad365c9 · 70c97e3b
Commit 70c97e3b authored Dec 05, 2014 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 11 deletions

drivers/regulator/da9063-regulator.c drivers/regulator/da9063-regulator.c +8 -11

No files found.
--- a/drivers/regulator/da9063-regulator.c
+++ b/drivers/regulator/da9063-regulator.c
@@ -867,17 +867,14 @@ static int da9063_regulator_probe(struct platform_device *pdev)
 		return irq;
 	}
-	regulators->irq_ldo_lim = regmap_irq_get_virq(da9063->regmap_irq, irq);
+	ret = request_threaded_irq(irq,
-	if (regulators->irq_ldo_lim >= 0) {
+				NULL, da9063_ldo_lim_event,
-		ret = request_threaded_irq(regulators->irq_ldo_lim,
+				IRQF_TRIGGER_LOW | IRQF_ONESHOT,
-					   NULL, da9063_ldo_lim_event,
+				"LDO_LIM", regulators);
-					   IRQF_TRIGGER_LOW | IRQF_ONESHOT,
+	if (ret) {
-					   "LDO_LIM", regulators);
+		dev_err(&pdev->dev,
-		if (ret) {
+				"Failed to request LDO_LIM IRQ.\n");
-			dev_err(&pdev->dev,
+		regulators->irq_ldo_lim = -ENXIO;
-					"Failed to request LDO_LIM IRQ.\n");
-			regulators->irq_ldo_lim = -ENXIO;
-		}
 	}
 	return 0;