From b8a5d100f1163e2efba82b7665fab830a25a3943 Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Thu, 21 Oct 2010 01:01:15 +0000
Subject: [PATCH] --- yaml --- r: 218371 b: refs/heads/master c:
 759a6c768dcdbbb4d3f1fb965b674c15773e09ca h: refs/heads/master i:   218369:
 03d6904c7b276956f438b72521f24a58755fe627   218367:
 31b73434573625eebdd7febc9a5a7f1793a015be v: v3

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

diff --git a/[refs] b/[refs]
index 072fb1468b79..3a64d76d2cba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a0e0a49b0a917c8c8dce6f7121ec73a5c8e3932
+refs/heads/master: 759a6c768dcdbbb4d3f1fb965b674c15773e09ca
diff --git a/trunk/drivers/net/can/at91_can.c b/trunk/drivers/net/can/at91_can.c
index 3b66c6736832..2c17e7437c47 100644
--- a/trunk/drivers/net/can/at91_can.c
+++ b/trunk/drivers/net/can/at91_can.c
@@ -1101,7 +1101,7 @@ static int __init at91_can_probe(struct platform_device *pdev)
 	return 0;
 
  exit_free:
-	free_netdev(dev);
+	free_candev(dev);
  exit_iounmap:
 	iounmap(addr);
  exit_release:
@@ -1122,8 +1122,6 @@ static int __devexit at91_can_remove(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, NULL);
 
-	free_netdev(dev);
-
 	iounmap(priv->reg_base);
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -1131,6 +1129,8 @@ static int __devexit at91_can_remove(struct platform_device *pdev)
 
 	clk_put(priv->clk);
 
+	free_candev(dev);
+
 	return 0;
 }