diff options
author | Marc Kleine-Budde <mkl@pengutronix.de> | 2014-02-28 14:52:01 +0100 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2014-04-02 00:58:57 +0100 |
commit | a523c634220331191acd0d3bbfce61fa4d02431b (patch) | |
tree | cffd7ed0827d267dd0d297b66d215d119a5f942b /drivers | |
parent | 5fdcc8da46cec9fc4f240dbd7ec1e70713d464cc (diff) |
can: flexcan: flexcan_open(): fix error path if flexcan_chip_start() fails
commit 7e9e148af01ef388efb6e2490805970be4622792 upstream.
If flexcan_chip_start() in flexcan_open() fails, the interrupt is not freed,
this patch adds the missing cleanup.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/can/flexcan.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 6bd45eef69cd..ea41a4ff4ef5 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -811,12 +811,14 @@ 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; napi_enable(&priv->napi); netif_start_queue(dev); return 0; + out_free_irq: + free_irq(dev->irq, dev); out_close: close_candev(dev); out: |