---

yaml --- r: 204160 b: refs/heads/master c: b9a0f87 h: refs/heads/master v: v3
git-mirror · Jul 27, 2010 · f29c97f · f29c97f
1 parent 7a82e16
commit f29c97f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc7e9f5f9999d9c015686ab4a622e1fb529391eb
+refs/heads/master: b9a0f872a9ff3b5074c74da98052b5205929b560
diff --git a/trunk/drivers/message/fusion/mptbase.c b/trunk/drivers/message/fusion/mptbase.c
@@ -6974,6 +6974,7 @@ mpt_SoftResetHandler(MPT_ADAPTER *ioc, int sleepFlag)
 
 	spin_lock_irqsave(&ioc->taskmgmt_lock, flags);
 	if (ioc->taskmgmt_in_progress) {
+		ioc->ioc_reset_in_progress = 0;
 		spin_unlock_irqrestore(&ioc->taskmgmt_lock, flags);
 		return -1;
 	}