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/pdc_adma.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/pdc_adma.c')
-rw-r--r-- | drivers/scsi/pdc_adma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/pdc_adma.c b/drivers/scsi/pdc_adma.c index ff4fec96271b..a4dcb4352206 100644 --- a/drivers/scsi/pdc_adma.c +++ b/drivers/scsi/pdc_adma.c | |||
@@ -456,7 +456,7 @@ static inline unsigned int adma_intr_pkt(struct ata_host_set *host_set) | |||
456 | continue; | 456 | continue; |
457 | handled = 1; | 457 | handled = 1; |
458 | adma_enter_reg_mode(ap); | 458 | adma_enter_reg_mode(ap); |
459 | if (ap->flags & ATA_FLAG_PORT_DISABLED) | 459 | if (ap->flags & ATA_FLAG_DISABLED) |
460 | continue; | 460 | continue; |
461 | pp = ap->private_data; | 461 | pp = ap->private_data; |
462 | if (!pp || pp->state != adma_state_pkt) | 462 | if (!pp || pp->state != adma_state_pkt) |
@@ -481,7 +481,7 @@ static inline unsigned int adma_intr_mmio(struct ata_host_set *host_set) | |||
481 | for (port_no = 0; port_no < host_set->n_ports; ++port_no) { | 481 | for (port_no = 0; port_no < host_set->n_ports; ++port_no) { |
482 | struct ata_port *ap; | 482 | struct ata_port *ap; |
483 | ap = host_set->ports[port_no]; | 483 | ap = host_set->ports[port_no]; |
484 | if (ap && (!(ap->flags & ATA_FLAG_PORT_DISABLED))) { | 484 | if (ap && (!(ap->flags & ATA_FLAG_DISABLED))) { |
485 | struct ata_queued_cmd *qc; | 485 | struct ata_queued_cmd *qc; |
486 | struct adma_port_priv *pp = ap->private_data; | 486 | struct adma_port_priv *pp = ap->private_data; |
487 | if (!pp || pp->state != adma_state_mmio) | 487 | if (!pp || pp->state != adma_state_mmio) |