From cc29d6cf9cd886f013d1dd27d1cfa63f9bf4fb33 Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Mon, 16 Nov 2009 12:57:53 +0000 Subject: [PATCH] --- yaml --- r: 171595 b: refs/heads/master c: 323907ac72a223ed4e4d67ce8e3589900023a0c8 h: refs/heads/master i: 171593: 8fc88369a9c40d4db8fa30cdc465e83c413b92d1 171591: 7db2dfb21ca013abc4e081d9c31a17caea9a8cdd v: v3 --- [refs] | 2 +- trunk/drivers/net/can/mscan/mscan.c | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 110b15a8a911..644b79b76146 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74ff60b29ec602322178d32cb2a82b24ddb884fc +refs/heads/master: 323907ac72a223ed4e4d67ce8e3589900023a0c8 diff --git a/trunk/drivers/net/can/mscan/mscan.c b/trunk/drivers/net/can/mscan/mscan.c index 263d1a9f0880..bb06dfb58f25 100644 --- a/trunk/drivers/net/can/mscan/mscan.c +++ b/trunk/drivers/net/can/mscan/mscan.c @@ -542,10 +542,8 @@ static int mscan_open(struct net_device *dev) ret = request_irq(dev->irq, mscan_isr, 0, dev->name, dev); if (ret < 0) { - napi_disable(&priv->napi); - printk(KERN_ERR "%s - failed to attach interrupt\n", - dev->name); - return ret; + dev_err(dev->dev.parent, "failed to attach interrupt\n"); + goto exit_napi_disable; } priv->open_time = jiffies; @@ -554,11 +552,19 @@ static int mscan_open(struct net_device *dev) ret = mscan_start(dev); if (ret) - return ret; + goto exit_free_irq; netif_start_queue(dev); return 0; + +exit_free_irq: + priv->open_time = 0; + free_irq(dev->irq, dev); +exit_napi_disable: + napi_disable(&priv->napi); + close_candev(dev); + return ret; } static int mscan_close(struct net_device *dev)