Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index ef443a090ba7..17678117ed69 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -923,7 +923,7 @@ static int __devinit flexcan_probe(struct platform_device *pdev)
         mem_size = resource_size(mem);
         if (!request_mem_region(mem->start, mem_size, pdev->name)) {
                 err = -EBUSY;
-                goto failed_req;
+                goto failed_get;
         }
 
         base = ioremap(mem->start, mem_size);
@@ -977,9 +977,8 @@ static int __devinit flexcan_probe(struct platform_device *pdev)
         iounmap(base);
  failed_map:
         release_mem_region(mem->start, mem_size);
- failed_req:
-        clk_put(clk);
  failed_get:
+        clk_put(clk);
  failed_clock:
         return err;
 }
@@ -992,7 +991,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 +998,8 @@ static int __devexit flexcan_remove(struct platform_device *pdev)
 
         clk_put(priv->clk);
 
+        free_candev(dev);
+
         return 0;
 }