Merge remote-tracking branch 'regulator/fix/da9063' into regulator-linus (70c97e3b) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/regulator/da9063-regulator.c

+8 −11

Original line number	Original line	Diff line number	Diff line
	@@ -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)
	"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;
	}		}