Fix scsi_eh escalation panic by checking the proper return status Signed-off-by: James Smart <james.smart@xxxxxxxxxx> --- lpfc_scsi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -upNr a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c --- a/drivers/scsi/lpfc/lpfc_scsi.c 2012-07-22 11:35:20.453631868 -0400 +++ b/drivers/scsi/lpfc/lpfc_scsi.c 2012-07-22 11:35:20.648631862 -0400 @@ -4414,7 +4414,7 @@ lpfc_abort_handler(struct scsi_cmnd *cmn DECLARE_WAIT_QUEUE_HEAD_ONSTACK(waitq); status = fc_block_scsi_eh(cmnd); - if (status) + if (status != 0 && status != SUCCESS) return status; spin_lock_irq(&phba->hbalock); @@ -4769,7 +4769,7 @@ lpfc_device_reset_handler(struct scsi_cm } pnode = rdata->pnode; status = fc_block_scsi_eh(cmnd); - if (status) + if (status != 0 && status != SUCCESS) return status; status = lpfc_chk_tgt_mapped(vport, cmnd); @@ -4836,7 +4836,7 @@ lpfc_target_reset_handler(struct scsi_cm } pnode = rdata->pnode; status = fc_block_scsi_eh(cmnd); - if (status) + if (status != 0 && status != SUCCESS) return status; status = lpfc_chk_tgt_mapped(vport, cmnd); @@ -4904,7 +4904,7 @@ lpfc_bus_reset_handler(struct scsi_cmnd sizeof(scsi_event), (char *)&scsi_event, LPFC_NL_VENDOR_ID); status = fc_block_scsi_eh(cmnd); - if (status) + if (status != 0 && status != SUCCESS) return status; /* -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html