From 0ac57d8fce1be50611992bf0fbaf0eb236ee5243 Mon Sep 17 00:00:00 2001
From: Andrzej Jakowski <andrzej.jakowski@intel.com>
Date: Fri, 10 Feb 2012 01:18:54 -0800
Subject: [PATCH] --- yaml --- r: 293036 b: refs/heads/master c:
 13de2c541993394ec4db4949302312a0ce0af7b1 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/scsi/isci/init.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ee1adc6036e0..5fc6adc389d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e462116afb1e436d4045167e7fe979405ae33d2b
+refs/heads/master: 13de2c541993394ec4db4949302312a0ce0af7b1
diff --git a/trunk/drivers/scsi/isci/init.c b/trunk/drivers/scsi/isci/init.c
index c9af456e7dfe..5137db5a5d85 100644
--- a/trunk/drivers/scsi/isci/init.c
+++ b/trunk/drivers/scsi/isci/init.c
@@ -60,6 +60,7 @@
 #include <linux/efi.h>
 #include <asm/string.h>
 #include <scsi/scsi_host.h>
+#include "host.h"
 #include "isci.h"
 #include "task.h"
 #include "probe_roms.h"
@@ -552,9 +553,9 @@ static void __devexit isci_pci_remove(struct pci_dev *pdev)
 	int i;
 
 	for_each_isci_host(i, ihost, pdev) {
+		wait_for_start(ihost);
 		isci_unregister(ihost);
 		isci_host_deinit(ihost);
-		sci_controller_disable_interrupts(ihost);
 	}
 }