Skip to content

L
linux
Commit 70c97e3b authored by Mark Brown's avatar Mark Brown
Browse files
Options

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

parents 009d0431 8ad365c9
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 11 deletions
drivers/regulator/da9063-regulator.c
View file @ 70c97e3b
...@@ -867,9 +867,7 @@ static int da9063_regulator_probe(struct platform_device *pdev) ...@@ -867,9 +867,7 @@ static int da9063_regulator_probe(struct platform_device *pdev)
return irq; 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) {
ret = request_threaded_irq(regulators->irq_ldo_lim,
NULL, da9063_ldo_lim_event, NULL, da9063_ldo_lim_event,
IRQF_TRIGGER_LOW | IRQF_ONESHOT, IRQF_TRIGGER_LOW | IRQF_ONESHOT,
"LDO_LIM", regulators); "LDO_LIM", regulators);
...@@ -878,7 +876,6 @@ static int da9063_regulator_probe(struct platform_device *pdev) ...@@ -878,7 +876,6 @@ static int da9063_regulator_probe(struct platform_device *pdev)
"Failed to request LDO_LIM IRQ.\n"); "Failed to request LDO_LIM IRQ.\n");
regulators->irq_ldo_lim = -ENXIO; regulators->irq_ldo_lim = -ENXIO;
} }
}
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7