From 87be15d90bcbe88c94365c7c68ed636188ee9a06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20Iglesias=20Gons=C3=A1lvez?= <siglesias@igalia.com>
Date: Tue, 11 Sep 2012 13:35:10 +0200
Subject: [PATCH] --- yaml --- r: 325178 b: refs/heads/master c:
 9c0d169e8fd9637eebe98e1ad4e61c0de9edc43e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e9cdf93118d2..7276092303aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bffe0fd02198fb13586ad4f572c1a028b8547ecd
+refs/heads/master: 9c0d169e8fd9637eebe98e1ad4e61c0de9edc43e
diff --git a/trunk/drivers/staging/ipack/bridges/tpci200.c b/trunk/drivers/staging/ipack/bridges/tpci200.c
index 77e6392fee08..8de74c97d76b 100644
--- a/trunk/drivers/staging/ipack/bridges/tpci200.c
+++ b/trunk/drivers/staging/ipack/bridges/tpci200.c
@@ -610,11 +610,6 @@ static int tpci200_reset_timeout(struct ipack_device *dev)
 
 static void tpci200_uninstall(struct tpci200_board *tpci200)
 {
-	int i;
-
-	for (i = 0; i < TPCI200_NB_SLOT; i++)
-		ipack_device_unregister(tpci200->slots[i].dev);
-
 	tpci200_unregister(tpci200);
 	kfree(tpci200->slots);
 }
@@ -751,8 +746,8 @@ static int tpci200_pci_probe(struct pci_dev *pdev,
 
 static void __tpci200_pci_remove(struct tpci200_board *tpci200)
 {
-	tpci200_uninstall(tpci200);
 	ipack_bus_unregister(tpci200->info->ipack_bus);
+	tpci200_uninstall(tpci200);
 
 	kfree(tpci200->info);
 	kfree(tpci200);