From 325f446ab705407c77e6eee922e9a01be82bbb93 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Wed, 1 Jun 2011 19:48:50 +0000
Subject: [PATCH] --- yaml --- r: 253058 b: refs/heads/master c:
 2e4ceec4edaef6e903422792de4f7f37de98cec6 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5ad57cf5bc57..bd97bee9c638 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6979d5dd96a4a4975ce240982436e92a3da23315
+refs/heads/master: 2e4ceec4edaef6e903422792de4f7f37de98cec6
diff --git a/trunk/drivers/net/can/flexcan.c b/trunk/drivers/net/can/flexcan.c
index d4990568baee..17678117ed69 100644
--- a/trunk/drivers/net/can/flexcan.c
+++ b/trunk/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;
 }