diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-02 10:30:40 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-02 10:30:40 -0400 |
| commit | 029f5468b5b5f93a09bf90326fdcb9124079658d (patch) | |
| tree | f869fb02ad1ca49e0920e073b22cbb96a184ccae /drivers/scsi/sata_promise.c | |
| parent | 8e181c14f2baa5be9b7f7c3917b7d4ecf7529110 (diff) | |
| parent | 1ad8e7f9eb051b040880e45337ed74bfd916ef7f (diff) | |
Merge branch 'upstream'
Conflicts:
drivers/scsi/libata-core.c
drivers/scsi/pdc_adma.c
drivers/scsi/sata_mv.c
drivers/scsi/sata_nv.c
drivers/scsi/sata_promise.c
drivers/scsi/sata_qstor.c
drivers/scsi/sata_sx4.c
drivers/scsi/sata_vsc.c
include/linux/libata.h
Diffstat (limited to 'drivers/scsi/sata_promise.c')
| -rw-r--r-- | drivers/scsi/sata_promise.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c index cf0eeba47eb6..322525d84907 100644 --- a/drivers/scsi/sata_promise.c +++ b/drivers/scsi/sata_promise.c | |||
| @@ -535,7 +535,7 @@ static irqreturn_t pdc_interrupt (int irq, void *dev_instance, struct pt_regs *r | |||
| 535 | ap = host_set->ports[i]; | 535 | ap = host_set->ports[i]; |
| 536 | tmp = mask & (1 << (i + 1)); | 536 | tmp = mask & (1 << (i + 1)); |
| 537 | if (tmp && ap && | 537 | if (tmp && ap && |
| 538 | !(ap->flags & ATA_FLAG_PORT_DISABLED)) { | 538 | !(ap->flags & ATA_FLAG_DISABLED)) { |
| 539 | struct ata_queued_cmd *qc; | 539 | struct ata_queued_cmd *qc; |
| 540 | 540 | ||
| 541 | qc = ata_qc_from_tag(ap, ap->active_tag); | 541 | qc = ata_qc_from_tag(ap, ap->active_tag); |