From 92a049f54545d124ad6ac1e20fcfccbdea47a7f8 Mon Sep 17 00:00:00 2001
From: Wolfgang Grandegger <wg@grandegger.com>
Date: Mon, 20 Jul 2009 04:06:40 +0000
Subject: [PATCH] --- yaml --- r: 155666 b: refs/heads/master c:
 b3d0df7ca35018ebbc24fd102ed7021cf593ba74 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/can/dev.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0a7d7275efff..27cdc0e59acc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2372902d84af3443d421a984d812ec87eeb0758
+refs/heads/master: b3d0df7ca35018ebbc24fd102ed7021cf593ba74
diff --git a/trunk/drivers/net/can/dev.c b/trunk/drivers/net/can/dev.c
index 574daddc21bf..06083c32869a 100644
--- a/trunk/drivers/net/can/dev.c
+++ b/trunk/drivers/net/can/dev.c
@@ -346,7 +346,7 @@ void can_restart(unsigned long data)
 	skb = dev_alloc_skb(sizeof(struct can_frame));
 	if (skb == NULL) {
 		err = -ENOMEM;
-		goto out;
+		goto restart;
 	}
 	skb->dev = dev;
 	skb->protocol = htons(ETH_P_CAN);
@@ -361,13 +361,13 @@ void can_restart(unsigned long data)
 	stats->rx_packets++;
 	stats->rx_bytes += cf->can_dlc;
 
+restart:
 	dev_dbg(dev->dev.parent, "restarted\n");
 	priv->can_stats.restarts++;
 
 	/* Now restart the device */
 	err = priv->do_set_mode(dev, CAN_MODE_START);
 
-out:
 	netif_carrier_on(dev);
 	if (err)
 		dev_err(dev->dev.parent, "Error %d during restart", err);