From 2a2a227ac815dbfae153845a5849c5785a8a7f1b Mon Sep 17 00:00:00 2001
From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Mon, 15 Dec 2008 14:13:27 -0600
Subject: [PATCH] --- yaml --- r: 119989 b: refs/heads/master c:
 a6da74cb077e88a604e5b2a6663b44c221f0ae75 h: refs/heads/master i:   119987:
 bbb7147be5b1b9db5adc50231ee2c445c493c50e v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/message/fusion/mptscsih.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0d557e71b071..e24c29b27810 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02bd3499a3be984f1e88821c3ed252c8c49c498e
+refs/heads/master: a6da74cb077e88a604e5b2a6663b44c221f0ae75
diff --git a/trunk/drivers/message/fusion/mptscsih.c b/trunk/drivers/message/fusion/mptscsih.c
index d62fd4f6b52e..ee090413e598 100644
--- a/trunk/drivers/message/fusion/mptscsih.c
+++ b/trunk/drivers/message/fusion/mptscsih.c
@@ -2008,6 +2008,9 @@ mptscsih_host_reset(struct scsi_cmnd *SCpnt)
 		return FAILED;
 	}
 
+	/* make sure we have no outstanding commands at this stage */
+	mptscsih_flush_running_cmds(hd);
+
 	ioc = hd->ioc;
 	printk(MYIOC_s_INFO_FMT "attempting host reset! (sc=%p)\n",
 	    ioc->name, SCpnt);