diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-13 15:16:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-13 15:16:35 +0100 |
| commit | 234bf1f0f03f879da2be698fb749f9a4b7322221 (patch) | |
| tree | 937f7946f6afb26a659d555a56116abed3ddd3e2 /drivers/regulator/da9055-regulator.c | |
| parent | ASoC: Intel: don't select RT5640 if !I2C (diff) | |
| parent | Merge remote-tracking branches 'asoc/topic/wm8996', 'asoc/topic/wm9081' and '... (diff) | |
| download | linux-234bf1f0f03f879da2be698fb749f9a4b7322221.tar.xz linux-234bf1f0f03f879da2be698fb749f9a4b7322221.zip | |
Merge tag 'asoc-v3.15' into asoc-intel
ASoC: Updates for v3.15
Quite a busy release for ASoC this time, more on janitorial work than
exciting new features but welcome nontheless:
- Lots of cleanups from Takashi for enumerations; the original API for
these was error prone so he's refactored lots of code to use more
modern APIs which avoid issues.
- Elimination of the ASoC level wrappers for I2C and SPI moving us
closer to converting to regmap completely and avoiding some
randconfig hassle.
- Provide both manually and transparently locked DAPM APIs rather than
a mix of the two fixing some concurrency issues.
- Start converting CODEC drivers to use separate bus interface drivers
rather than having them all in one file helping avoid dependency
issues.
- DPCM support for Intel Haswell and Bay Trail platforms.
- Lots of work on improvements for simple-card, DaVinci and the Renesas
rcar drivers.
- New drivers for Analog Devices ADAU1977, TI PCM512x and parts of the
CSR SiRF SoC.
Conflicts:
sound/soc/intel/Kconfig
Diffstat (limited to 'drivers/regulator/da9055-regulator.c')
| -rw-r--r-- | drivers/regulator/da9055-regulator.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/regulator/da9055-regulator.c b/drivers/regulator/da9055-regulator.c index 7f340206d329..b14ebdad5dd2 100644 --- a/drivers/regulator/da9055-regulator.c +++ b/drivers/regulator/da9055-regulator.c @@ -576,7 +576,9 @@ static int da9055_regulator_probe(struct platform_device *pdev) /* Only LDO 5 and 6 has got the over current interrupt */ if (pdev->id == DA9055_ID_LDO5 || pdev->id == DA9055_ID_LDO6) { irq = platform_get_irq_byname(pdev, "REGULATOR"); - irq = regmap_irq_get_virq(da9055->irq_data, irq); + if (irq < 0) + return irq; + ret = devm_request_threaded_irq(&pdev->dev, irq, NULL, da9055_ldo5_6_oc_irq, IRQF_TRIGGER_HIGH | |