From f29c97f1781888420e6e63ec92cf19f62e05fe43 Mon Sep 17 00:00:00 2001 From: "Kashyap, Desai" Date: Thu, 17 Jun 2010 14:42:39 +0530 Subject: [PATCH] --- yaml --- r: 204160 b: refs/heads/master c: b9a0f872a9ff3b5074c74da98052b5205929b560 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/message/fusion/mptbase.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index da7e0c2d93ba..2bcc09a8777d 100644 --- 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 index 49005e151058..d0855f278db4 100644 --- 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; }