evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Mark Brown 2014-12-05 11:14:33 +00:00
commit 70c97e3b11
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/regulator/da9063-regulator.c
View file

@ -867,17 +867,14 @@ 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) { 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; return 0;