diff options
| author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2015-06-20 03:32:46 +0300 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-08-10 11:54:18 +0300 |
| commit | dfe8266d54822ef91fbdf38b2cd232e67eddfe9d (patch) | |
| tree | ad29e12521ca0080eb7a4177f09737a1194e179e /drivers/net/can | |
| parent | 16da885e5a830ea972e36339cf6939642e915b66 (diff) | |
| download | linux-dfe8266d54822ef91fbdf38b2cd232e67eddfe9d.tar.xz | |
can: rcar_can: fix IRQ check
commit 5e63e6baa159fa8c787cf783dbf3d77fbea97331 upstream.
rcar_can_probe() regards 0 as a wrong IRQ #, despite platform_get_irq() that it
calls returns negative error code in that case. This leads to the following
being printed to the console when attempting to open the device:
error requesting interrupt fffffffa
because rcar_can_open() calls request_irq() with a negative IRQ #, and that
function naturally fails with -EINVAL.
Check for the negative error codes instead and propagate them upstream instead
of just returning -ENODEV.
Fixes: fd1159318e55 ("can: add Renesas R-Car CAN driver")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/rcar_can.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/can/rcar_can.c b/drivers/net/can/rcar_can.c index 5268d216ecfa..ebdfc3908aad 100644 --- a/drivers/net/can/rcar_can.c +++ b/drivers/net/can/rcar_can.c @@ -732,8 +732,9 @@ static int rcar_can_probe(struct platform_device *pdev) } irq = platform_get_irq(pdev, 0); - if (!irq) { + if (irq < 0) { dev_err(&pdev->dev, "No IRQ resource\n"); + err = irq; goto fail; } |