Commit aff8ad59fee4b79f2986b1bccb942bed94fd43fa
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
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
Showing 1 changed file Side-by-side Diff
drivers/scsi/qla2xxx/qla_os.c
| ... | ... | @@ -734,7 +734,9 @@ |
| 734 | 734 | * Return target busy if we've received a non-zero retry_delay_timer |
| 735 | 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 | 740 | fcport->retry_delay_timestamp = 0; |
| 739 | 741 | else |
| 740 | 742 | goto qc24_target_busy; |