From f2b4c2afb13d964da6e8805efc15650a6eb4e0d0 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 3 Jul 2007 15:11:30 +0100 Subject: [PATCH] --- yaml --- r: 58172 b: refs/heads/master c: d6f4d5eafdd0bbdaa166a0650d27045c26ca63dd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/ata_generic.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 62d80796db88..05147ddbc7b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee5815023527dd579ada340786e329ff6c5c0eea +refs/heads/master: d6f4d5eafdd0bbdaa166a0650d27045c26ca63dd diff --git a/trunk/drivers/ata/ata_generic.c b/trunk/drivers/ata/ata_generic.c index 7565f022bd69..4c6e95c95e4a 100644 --- a/trunk/drivers/ata/ata_generic.c +++ b/trunk/drivers/ata/ata_generic.c @@ -50,7 +50,7 @@ static int generic_set_mode(struct ata_port *ap, struct ata_device **unused) /* Bits 5 and 6 indicate if DMA is active on master/slave */ if (ap->ioaddr.bmdma_addr) - dma_enabled = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_CMD); + dma_enabled = ioread8(ap->ioaddr.bmdma_addr + ATA_DMA_STATUS); for (i = 0; i < ATA_MAX_DEVICES; i++) { struct ata_device *dev = &ap->device[i];