Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aff8ad59 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents eb749269 975f7d46

drivers/scsi/qla2xxx/qla_os.c

+3 −1
Original line number Diff line number Diff line
@@ -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;