Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 17:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/can/mscan: add error path to mscan_open()

Browse Source 
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Wolfram Sang 2009-11-16 12:57:53 +00:00 committed by David S. Miller
parent 74ff60b29e
commit 323907ac72
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/can/mscan/mscan.c
View File

@ -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)