From fff6c54921a70fa62517d78a28356ab6164986fd Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Wed, 1 Jun 2011 17:10:11 +0000
Subject: [PATCH] --- yaml --- r: 253131 b: refs/heads/master c:
 609d3bbf044a6766f6505d8a29d4ed48020c014c h: refs/heads/master i:   253129:
 dbf8ad1eefb036aa8abc4de41132411918cee690   253127:
 f5dbb6e315c564ef6bbb065ada6d4aa0599a83ed v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/imxfb.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index aaac7f55fb25..88dba3b961b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70f289db31502ac030049450e63d380f3bc30cd2
+refs/heads/master: 609d3bbf044a6766f6505d8a29d4ed48020c014c
diff --git a/trunk/drivers/video/imxfb.c b/trunk/drivers/video/imxfb.c
index d2ccfd6e662c..f135dbead07d 100644
--- a/trunk/drivers/video/imxfb.c
+++ b/trunk/drivers/video/imxfb.c
@@ -856,10 +856,10 @@ static int __init imxfb_probe(struct platform_device *pdev)
 		dma_free_writecombine(&pdev->dev,fbi->map_size,fbi->map_cpu,
 			fbi->map_dma);
 failed_map:
-	clk_put(fbi->clk);
-failed_getclock:
 	iounmap(fbi->regs);
 failed_ioremap:
+	clk_put(fbi->clk);
+failed_getclock:
 	release_mem_region(res->start, resource_size(res));
 failed_req:
 	kfree(info->pseudo_palette);