projects
/
platform
/
kernel
/
linux-exynos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5be93bd
)
can: flexcan: flexcan_open(): fix error path if flexcan_chip_start() fails
author
Marc Kleine-Budde
<mkl@pengutronix.de>
Fri, 28 Feb 2014 13:52:01 +0000
(14:52 +0100)
committer
Marc Kleine-Budde
<mkl@pengutronix.de>
Mon, 3 Mar 2014 11:41:22 +0000
(12:41 +0100)
If flexcan_chip_start() in flexcan_open() fails, the interrupt is not freed,
this patch adds the missing cleanup.
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/flexcan.c
patch
|
blob
|
history
diff --git
a/drivers/net/can/flexcan.c
b/drivers/net/can/flexcan.c
index dcd69c9374aea08d48c42d4c2ca2ff4731363a8c..30af702a07ad37121dc3b8154177d979c92a7647 100644
(file)
--- a/
drivers/net/can/flexcan.c
+++ b/
drivers/net/can/flexcan.c
@@
-868,7
+868,7
@@
static int flexcan_open(struct net_device *dev)
/* start chip and queuing */
err = flexcan_chip_start(dev);
if (err)
- goto out_
close
;
+ goto out_
free_irq
;
can_led_event(dev, CAN_LED_EVENT_OPEN);
@@
-877,6
+877,8
@@
static int flexcan_open(struct net_device *dev)
return 0;
+ out_free_irq:
+ free_irq(dev->irq, dev);
out_close:
close_candev(dev);
out_disable_per: