Pull SCSI fix from James Bottomley: "Just one fix: a qlogic busy wait regression" * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: qla2xxx: fix busy wait regression
Unified · Split
| @@ -734,7 +734,9 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) · 733 unmodified lines | |||
| 734 | * Return target busy if we've received a non-zero retry_delay_timer | 734 | * Return target busy if we've received a non-zero retry_delay_timer |
| 735 | * in a FCP_RSP. | 735 | * in a FCP_RSP. |
| 736 | */ | 736 | */ |
| 737 | if (time_after(jiffies, fcport->retry_delay_timestamp)) | 737 | if (fcport->retry_delay_timestamp == 0) { |
| 738 | /* retry delay not set */ | ||
| 739 | } else if (time_after(jiffies, fcport->retry_delay_timestamp)) | ||
| 738 | fcport->retry_delay_timestamp = 0; | 740 | fcport->retry_delay_timestamp = 0; |
| 739 | else | 741 | else |
| 740 | goto qc24_target_busy; | 742 | goto qc24_target_busy; |