From 10e2a56060caf558dbfaeb79d3ac6f00114ab31f Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 10 May 2012 18:19:04 +0300
Subject: [PATCH] --- yaml --- r: 304614 b: refs/heads/master c:
 3a745b6f471dbd7e057b30e031e476c41c6a2bf8 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/staging/ipack/bridges/tpci200.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6c4edb019f46..9f6e5a599531 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bdeeb26c57012ea19a3b8fe3aeaecff377ae07d
+refs/heads/master: 3a745b6f471dbd7e057b30e031e476c41c6a2bf8
diff --git a/trunk/drivers/staging/ipack/bridges/tpci200.c b/trunk/drivers/staging/ipack/bridges/tpci200.c
index ab6ea0a5548c..08cd85150ef2 100644
--- a/trunk/drivers/staging/ipack/bridges/tpci200.c
+++ b/trunk/drivers/staging/ipack/bridges/tpci200.c
@@ -867,8 +867,8 @@ static int tpci200_slot_unregister(struct ipack_device *dev)
 		return -ERESTARTSYS;
 
 	ipack_device_unregister(dev);
-	kfree(dev);
 	tpci200->slots[dev->slot].dev = NULL;
+	kfree(dev);
 	mutex_unlock(&tpci200->mutex);
 
 	return 0;