diff options
| -rw-r--r-- | drivers/net/can/dev.c | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index 574daddc21bf..06083c32869a 100644 --- a/drivers/net/can/dev.c +++ b/drivers/net/can/dev.c | |||
| @@ -346,7 +346,7 @@ void can_restart(unsigned long data) | |||
| 346 | skb = dev_alloc_skb(sizeof(struct can_frame)); | 346 | skb = dev_alloc_skb(sizeof(struct can_frame)); | 
| 347 | if (skb == NULL) { | 347 | if (skb == NULL) { | 
| 348 | err = -ENOMEM; | 348 | err = -ENOMEM; | 
| 349 | goto out; | 349 | goto restart; | 
| 350 | } | 350 | } | 
| 351 | skb->dev = dev; | 351 | skb->dev = dev; | 
| 352 | skb->protocol = htons(ETH_P_CAN); | 352 | skb->protocol = htons(ETH_P_CAN); | 
| @@ -361,13 +361,13 @@ void can_restart(unsigned long data) | |||
| 361 | stats->rx_packets++; | 361 | stats->rx_packets++; | 
| 362 | stats->rx_bytes += cf->can_dlc; | 362 | stats->rx_bytes += cf->can_dlc; | 
| 363 | 363 | ||
| 364 | restart: | ||
| 364 | dev_dbg(dev->dev.parent, "restarted\n"); | 365 | dev_dbg(dev->dev.parent, "restarted\n"); | 
| 365 | priv->can_stats.restarts++; | 366 | priv->can_stats.restarts++; | 
| 366 | 367 | ||
| 367 | /* Now restart the device */ | 368 | /* Now restart the device */ | 
| 368 | err = priv->do_set_mode(dev, CAN_MODE_START); | 369 | err = priv->do_set_mode(dev, CAN_MODE_START); | 
| 369 | 370 | ||
| 370 | out: | ||
| 371 | netif_carrier_on(dev); | 371 | netif_carrier_on(dev); | 
| 372 | if (err) | 372 | if (err) | 
| 373 | dev_err(dev->dev.parent, "Error %d during restart", err); | 373 | dev_err(dev->dev.parent, "Error %d during restart", err); | 
