From 3305113b635135914303a9211d5abe0b4fd5f890 Mon Sep 17 00:00:00 2001 From: "Kashyap, Desai" Date: Thu, 18 Mar 2010 19:14:51 +0530 Subject: [PATCH] --- yaml --- r: 195589 b: refs/heads/master c: b3b97316d5861b1708cd7ef2df9989d12d97acb9 h: refs/heads/master i: 195587: 6ae53a45d6ef80171dbe3778ff20b405980924a4 v: v3 --- [refs] | 2 +- trunk/drivers/message/fusion/mptbase.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d25bf2221710..fe9e1155e0e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d757f18554070e917f61e7caedf395f940cf853 +refs/heads/master: b3b97316d5861b1708cd7ef2df9989d12d97acb9 diff --git a/trunk/drivers/message/fusion/mptbase.c b/trunk/drivers/message/fusion/mptbase.c index a4f023bd5d2b..a6a57011ba6c 100644 --- a/trunk/drivers/message/fusion/mptbase.c +++ b/trunk/drivers/message/fusion/mptbase.c @@ -6456,10 +6456,15 @@ mpt_config(MPT_ADAPTER *ioc, CONFIGPARMS *pCfg) issue_hard_reset = 0; printk(MYIOC_s_WARN_FMT "Issuing Reset from %s!!\n", ioc->name, __func__); - mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP); + if (retry_count == 0) { + if (mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP) != 0) + retry_count++; + } else + mpt_HardResetHandler(ioc, CAN_SLEEP); + mpt_free_msg_frame(ioc, mf); /* attempt one retry for a timed out command */ - if (!retry_count) { + if (retry_count < 2) { printk(MYIOC_s_INFO_FMT "Attempting Retry Config request" " type 0x%x, page 0x%x,"