]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[SCSI] mpt2sas: Corrected conditional checks for Internal device Reset
authorKashyap, Desai <kashyap.desai@lsi.com>
Wed, 17 Mar 2010 10:52:21 +0000 (16:22 +0530)
committerJames Bottomley <James.Bottomley@suse.de>
Sun, 11 Apr 2010 14:23:54 +0000 (09:23 -0500)
bug fix in the handling of the internal device reset event
The reason code check in scsih_sas_device_status_change_event never
evaluates as true for internal device reset, hence driver never quiesce s IO
when firmware is sending a device reset. The fix is to change the
evaluate to:
if (event_data->ReasonCode !=
    MPI2_EVENT_SAS_DEV_STAT_RC_INTERNAL_DEVICE_RESET &&
   event_data->ReasonCode !=
    MPI2_EVENT_SAS_DEV_STAT_RC_CMP_INTERNAL_DEV_RESET)
        return;

Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
drivers/scsi/mpt2sas/mpt2sas_scsih.c

index fa94f0ff77624529ecbd65b071c3f5a6a4b1097b..f3ce9b1825b17002164b9318ad80d236b6fd9141 100644 (file)
@@ -4435,10 +4435,10 @@ _scsih_sas_device_status_change_event(struct MPT2SAS_ADAPTER *ioc,
                     event_data);
 #endif
 
-       if (!(event_data->ReasonCode ==
+       if (event_data->ReasonCode !=
            MPI2_EVENT_SAS_DEV_STAT_RC_INTERNAL_DEVICE_RESET &&
-          event_data->ReasonCode ==
-           MPI2_EVENT_SAS_DEV_STAT_RC_CMP_INTERNAL_DEV_RESET))
+          event_data->ReasonCode !=
+           MPI2_EVENT_SAS_DEV_STAT_RC_CMP_INTERNAL_DEV_RESET)
                return;
 
        spin_lock_irqsave(&ioc->sas_device_lock, flags);