projects/linux·commit aff8ad59

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

aff8ad59 · Linus Torvalds <[email protected]> · 2015-01-10 11:59:25 -08:00

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
Commit
aff8ad59fee4b79f2986b1bccb942bed94fd43fa
Parents
eb749269 · 975f7d46

Merge commit. Changes below are compared with the first parent: eb749269.

Changes

1 files changed · +3 −1

FileStatusAddDelContent
drivers/scsi/qla2xxx/qla_os.cmodified+3−1View file

drivers/scsi/qla2xxx/qla_os.c

View file
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 12ca291..cce1cbc 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -734,7 +734,9 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
* Return target busy if we've received a non-zero retry_delay_timer
* in a FCP_RSP.
*/
- if (time_after(jiffies, fcport->retry_delay_timestamp))
+ if (fcport->retry_delay_timestamp == 0) {
+ /* retry delay not set */
+ } else if (time_after(jiffies, fcport->retry_delay_timestamp))
fcport->retry_delay_timestamp = 0;
else
goto qc24_target_busy;