From cb89df199fb22e64ae4cf29c36099bd3439fdbfa Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Fri, 30 Jul 2010 17:17:28 +0200
Subject: [PATCH] --- yaml --- r: 201387 b: refs/heads/master c:
 f2d2420bbf4bb125ea5f2e1573d4da6b668fc78a h: refs/heads/master i:   201385:
 4395a27dde93752031d94224488df71d3be17cd2   201383:
 a6b9d3d6cec745f72a77a72ce87a6092b217caca v: v3

---
 [refs]                         | 2 +-
 trunk/arch/arm/common/sa1111.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f94b762fff4f..46334cfa2f67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74bc80931c8bc34d24545f992a35349ad548897c
+refs/heads/master: f2d2420bbf4bb125ea5f2e1573d4da6b668fc78a
diff --git a/trunk/arch/arm/common/sa1111.c b/trunk/arch/arm/common/sa1111.c
index 6f80665f477e..9eaf65f43642 100644
--- a/trunk/arch/arm/common/sa1111.c
+++ b/trunk/arch/arm/common/sa1111.c
@@ -1028,13 +1028,12 @@ static int sa1111_remove(struct platform_device *pdev)
 	struct sa1111 *sachip = platform_get_drvdata(pdev);
 
 	if (sachip) {
-		__sa1111_remove(sachip);
-		platform_set_drvdata(pdev, NULL);
-
 #ifdef CONFIG_PM
 		kfree(sachip->saved_state);
 		sachip->saved_state = NULL;
 #endif
+		__sa1111_remove(sachip);
+		platform_set_drvdata(pdev, NULL);
 	}
 
 	return 0;