diff options
Diffstat (limited to 'drivers/ata/sata_promise.c')
-rw-r--r-- | drivers/ata/sata_promise.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c index 25698cf0dce0..620d0675d18a 100644 --- a/drivers/ata/sata_promise.c +++ b/drivers/ata/sata_promise.c | |||
@@ -626,7 +626,7 @@ static void pdc_post_internal_cmd(struct ata_queued_cmd *qc) | |||
626 | static void pdc_error_intr(struct ata_port *ap, struct ata_queued_cmd *qc, | 626 | static void pdc_error_intr(struct ata_port *ap, struct ata_queued_cmd *qc, |
627 | u32 port_status, u32 err_mask) | 627 | u32 port_status, u32 err_mask) |
628 | { | 628 | { |
629 | struct ata_eh_info *ehi = &ap->eh_info; | 629 | struct ata_eh_info *ehi = &ap->link.eh_info; |
630 | unsigned int ac_err_mask = 0; | 630 | unsigned int ac_err_mask = 0; |
631 | 631 | ||
632 | ata_ehi_clear_desc(ehi); | 632 | ata_ehi_clear_desc(ehi); |
@@ -773,7 +773,7 @@ static irqreturn_t pdc_interrupt (int irq, void *dev_instance) | |||
773 | tmp = hotplug_status & (0x11 << ata_no); | 773 | tmp = hotplug_status & (0x11 << ata_no); |
774 | if (tmp && ap && | 774 | if (tmp && ap && |
775 | !(ap->flags & ATA_FLAG_DISABLED)) { | 775 | !(ap->flags & ATA_FLAG_DISABLED)) { |
776 | struct ata_eh_info *ehi = &ap->eh_info; | 776 | struct ata_eh_info *ehi = &ap->link.eh_info; |
777 | ata_ehi_clear_desc(ehi); | 777 | ata_ehi_clear_desc(ehi); |
778 | ata_ehi_hotplugged(ehi); | 778 | ata_ehi_hotplugged(ehi); |
779 | ata_ehi_push_desc(ehi, "hotplug_status %#x", tmp); | 779 | ata_ehi_push_desc(ehi, "hotplug_status %#x", tmp); |
@@ -788,7 +788,7 @@ static irqreturn_t pdc_interrupt (int irq, void *dev_instance) | |||
788 | !(ap->flags & ATA_FLAG_DISABLED)) { | 788 | !(ap->flags & ATA_FLAG_DISABLED)) { |
789 | struct ata_queued_cmd *qc; | 789 | struct ata_queued_cmd *qc; |
790 | 790 | ||
791 | qc = ata_qc_from_tag(ap, ap->active_tag); | 791 | qc = ata_qc_from_tag(ap, ap->link.active_tag); |
792 | if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) | 792 | if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) |
793 | handled += pdc_host_intr(ap, qc); | 793 | handled += pdc_host_intr(ap, qc); |
794 | } | 794 | } |