diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-06 15:53:29 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2016-10-04 15:48:03 +0100 |
| commit | b53046cbf8c90ca67a818c9093227e60cf1387b6 (patch) | |
| tree | ed0352f85fafa9081544312aa65963fcd6c615a8 /drivers/mfd | |
| parent | bab1e0c01810629a878faf0b3a2dd672693c58af (diff) | |
| download | op-kernel-dev-b53046cbf8c90ca67a818c9093227e60cf1387b6.zip op-kernel-dev-b53046cbf8c90ca67a818c9093227e60cf1387b6.tar.gz | |
mfd: ucb1x00: Remove NO_IRQ check
probe_irq_off() returns '0' on failure, not NO_IRQ, so the check
in this driver is clearly wrong. This replaces it with the
regular '!irq' check used in other drivers.
The sa1100 platform that this driver is used on originally numbered
all its interrupts starting at '0', which would have conflicted with
this change, but as of commit 18f3aec ("ARM: 8230/1: sa1100: shift
IRQs by one"), this is not a problem any more.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/ucb1x00-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c index 48bea50..d6fb2e1 100644 --- a/drivers/mfd/ucb1x00-core.c +++ b/drivers/mfd/ucb1x00-core.c @@ -537,7 +537,7 @@ static int ucb1x00_probe(struct mcp *mcp) ucb1x00_enable(ucb); ucb->irq = ucb1x00_detect_irq(ucb); ucb1x00_disable(ucb); - if (ucb->irq == NO_IRQ) { + if (!ucb->irq) { dev_err(&ucb->dev, "IRQ probe failed\n"); ret = -ENODEV; goto err_no_irq; |
