Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index ef443a090ba7..d4990568baee 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -992,7 +992,6 @@ static int __devexit flexcan_remove(struct platform_device *pdev)
 
         unregister_flexcandev(dev);
         platform_set_drvdata(pdev, NULL);
-        free_candev(dev);
         iounmap(priv->base);
 
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -1000,6 +999,8 @@ static int __devexit flexcan_remove(struct platform_device *pdev)
 
         clk_put(priv->clk);
 
+        free_candev(dev);
+
         return 0;
 }