Skip to content

Commit

Permalink
net/can/mscan: add error path to mscan_open()
Browse files Browse the repository at this point in the history
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Wolfram Sang authored and David S. Miller committed Nov 17, 2009
1 parent 74ff60b commit 323907a
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions drivers/net/can/mscan/mscan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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)
Expand Down

0 comments on commit 323907a

Please sign in to comment.