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;
 }