History

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

Linus Torvalds committed 11 years ago

Commit aff8ad52 parents eb74926 975f7d41 file · +3 −1Browse files

Unified · Split

drivers/scsi/qla2xxx/qla_os.c+3−1
@@ -734,7 +734,9 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) · 733 unmodified lines
734734 * Return target busy if we've received a non-zero retry_delay_timer
735735 * in a FCP_RSP.
736736 */
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))
738740 fcport->retry_delay_timestamp = 0;
739741 else
740742 goto qc24_target_busy;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t