Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Kernel bump from 4.1.3-rt to 4.1.7-rt.
[kvmfornfv.git]
/
kernel
/
drivers
/
net
/
can
/
rcar_can.c
diff --git
a/kernel/drivers/net/can/rcar_can.c
b/kernel/drivers/net/can/rcar_can.c
index
7deb80d
..
2f9ebad
100644
(file)
--- a/
kernel/drivers/net/can/rcar_can.c
+++ b/
kernel/drivers/net/can/rcar_can.c
@@
-526,7
+526,7
@@
static int rcar_can_open(struct net_device *ndev)
napi_enable(&priv->napi);
err = request_irq(ndev->irq, rcar_can_interrupt, 0, ndev->name, ndev);
if (err) {
napi_enable(&priv->napi);
err = request_irq(ndev->irq, rcar_can_interrupt, 0, ndev->name, ndev);
if (err) {
- netdev_err(ndev, "error requesting interrupt %
x
\n", ndev->irq);
+ netdev_err(ndev, "error requesting interrupt %
d
\n", ndev->irq);
goto out_close;
}
can_led_event(ndev, CAN_LED_EVENT_OPEN);
goto out_close;
}
can_led_event(ndev, CAN_LED_EVENT_OPEN);
@@
-758,8
+758,9
@@
static int rcar_can_probe(struct platform_device *pdev)
}
irq = platform_get_irq(pdev, 0);
}
irq = platform_get_irq(pdev, 0);
- if (
!irq
) {
+ if (
irq < 0
) {
dev_err(&pdev->dev, "No IRQ resource\n");
dev_err(&pdev->dev, "No IRQ resource\n");
+ err = irq;
goto fail;
}
goto fail;
}
@@
-823,7
+824,7
@@
static int rcar_can_probe(struct platform_device *pdev)
devm_can_led_init(ndev);
devm_can_led_init(ndev);
- dev_info(&pdev->dev, "device registered (reg
_base=%p, irq=%u
)\n",
+ dev_info(&pdev->dev, "device registered (reg
s @ %p, IRQ%d
)\n",
priv->regs, ndev->irq);
return 0;
priv->regs, ndev->irq);
return 0;