Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: implement dump_id force param
  libata: disable ATAPI AN by default
  libata-sff: make BMDMA optional
  libata-sff: kill dummy BMDMA ops from sata_qstor and pata_octeon_cf
  libata-sff: separate out BMDMA init
  libata-sff: separate out BMDMA irq handler
  libata-sff: ata_sff_irq_clear() is BMDMA specific
  sata_mv: drop unncessary EH callback resetting

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index 2dda312b6b9a..3a4f84219719 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -503,7 +503,7 @@ static void sil_host_intr(struct ata_port *ap, u32 bmdma2)
                 goto err_hsm;
 
         /* ack bmdma irq events */
-        ata_sff_irq_clear(ap);
+        ata_bmdma_irq_clear(ap);
 
         /* kick HSM in the ass */
         ata_sff_hsm_move(ap, qc, status, 0);
@@ -584,7 +584,7 @@ static void sil_thaw(struct ata_port *ap)
 
         /* clear IRQ */
         ap->ops->sff_check_status(ap);
-        ata_sff_irq_clear(ap);
+        ata_bmdma_irq_clear(ap);
 
         /* turn on SATA IRQ if supported */
         if (!(ap->flags & SIL_FLAG_NO_SATA_IRQ))