diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-03 15:09:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-03 15:09:56 +0100 |
| commit | bc0868c62bb13834b20a864f684cced1f84a2412 (patch) | |
| tree | 2c382dcd24ac95f4dbf53d238d3161d6171d8a4b /drivers/regulator/ltc3589.c | |
| parent | fd786fb0276a22155058018f76eb4c665d37f170 (diff) | |
| parent | 8c12ad8e916ee0477f7a0a0f00b0a87b9a21ebf7 (diff) | |
| download | op-kernel-dev-bc0868c62bb13834b20a864f684cced1f84a2412.zip op-kernel-dev-bc0868c62bb13834b20a864f684cced1f84a2412.tar.gz | |
Merge branch 'for-4.7/pwm-regulator' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm into regulator-pwm
Diffstat (limited to 'drivers/regulator/ltc3589.c')
| -rw-r--r-- | drivers/regulator/ltc3589.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/regulator/ltc3589.c b/drivers/regulator/ltc3589.c index 972c386..47bef32 100644 --- a/drivers/regulator/ltc3589.c +++ b/drivers/regulator/ltc3589.c @@ -520,12 +520,15 @@ static int ltc3589_probe(struct i2c_client *client, } } - ret = devm_request_threaded_irq(dev, client->irq, NULL, ltc3589_isr, - IRQF_TRIGGER_LOW | IRQF_ONESHOT, - client->name, ltc3589); - if (ret) { - dev_err(dev, "Failed to request IRQ: %d\n", ret); - return ret; + if (client->irq) { + ret = devm_request_threaded_irq(dev, client->irq, NULL, + ltc3589_isr, + IRQF_TRIGGER_LOW | IRQF_ONESHOT, + client->name, ltc3589); + if (ret) { + dev_err(dev, "Failed to request IRQ: %d\n", ret); + return ret; + } } return 0; |
