From f5e692cec719b94949b1c22504a2ba09ad11513d Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Tue, 21 Mar 2006 21:31:22 -0500 Subject: [PATCH] --- yaml --- r: 22387 b: refs/heads/master c: 4d4681f6b994baf93dff0e4f59ab4fe38b49ef13 h: refs/heads/master i: 22385: 0814cb0c7bf1482d225017c372574159e8a8d57e 22383: 34efecafb4b0e0d304001589c1494e3a5b5badcf v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libata-core.c | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index a7cce889823a..52e00ae1354e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17bb34a3c548c4fd2a7c859123a631f97c2af09f +refs/heads/master: 4d4681f6b994baf93dff0e4f59ab4fe38b49ef13 diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c index 673ddf611d0e..c8d2201b126f 100644 --- a/trunk/drivers/scsi/libata-core.c +++ b/trunk/drivers/scsi/libata-core.c @@ -4202,14 +4202,17 @@ void ata_bmdma_setup(struct ata_queued_cmd *qc) void ata_bmdma_irq_clear(struct ata_port *ap) { - if (ap->flags & ATA_FLAG_MMIO) { - void __iomem *mmio = ((void __iomem *) ap->ioaddr.bmdma_addr) + ATA_DMA_STATUS; - writeb(readb(mmio), mmio); - } else { - unsigned long addr = ap->ioaddr.bmdma_addr + ATA_DMA_STATUS; - outb(inb(addr), addr); - } + if (!ap->ioaddr.bmdma_addr) + return; + if (ap->flags & ATA_FLAG_MMIO) { + void __iomem *mmio = + ((void __iomem *) ap->ioaddr.bmdma_addr) + ATA_DMA_STATUS; + writeb(readb(mmio), mmio); + } else { + unsigned long addr = ap->ioaddr.bmdma_addr + ATA_DMA_STATUS; + outb(inb(addr), addr); + } }