diff options
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ide-dma.c | 4 | ||||
-rw-r--r-- | drivers/ide/pci/pdc202xx_new.c | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index c352cf27b6e7..767820db7cae 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
@@ -858,12 +858,8 @@ void ide_setup_dma(ide_hwif_t *hwif, unsigned long base) | |||
858 | 858 | ||
859 | if (!hwif->dma_command) | 859 | if (!hwif->dma_command) |
860 | hwif->dma_command = hwif->dma_base + 0; | 860 | hwif->dma_command = hwif->dma_base + 0; |
861 | if (!hwif->dma_vendor1) | ||
862 | hwif->dma_vendor1 = hwif->dma_base + 1; | ||
863 | if (!hwif->dma_status) | 861 | if (!hwif->dma_status) |
864 | hwif->dma_status = hwif->dma_base + 2; | 862 | hwif->dma_status = hwif->dma_base + 2; |
865 | if (!hwif->dma_vendor3) | ||
866 | hwif->dma_vendor3 = hwif->dma_base + 3; | ||
867 | if (!hwif->dma_prdtable) | 863 | if (!hwif->dma_prdtable) |
868 | hwif->dma_prdtable = hwif->dma_base + 4; | 864 | hwif->dma_prdtable = hwif->dma_base + 4; |
869 | 865 | ||
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c index ec9bd7b352fc..070df8ab3b21 100644 --- a/drivers/ide/pci/pdc202xx_new.c +++ b/drivers/ide/pci/pdc202xx_new.c | |||
@@ -83,8 +83,8 @@ static u8 get_indexed_reg(ide_hwif_t *hwif, u8 index) | |||
83 | { | 83 | { |
84 | u8 value; | 84 | u8 value; |
85 | 85 | ||
86 | outb(index, hwif->dma_vendor1); | 86 | outb(index, hwif->dma_base + 1); |
87 | value = inb(hwif->dma_vendor3); | 87 | value = inb(hwif->dma_base + 3); |
88 | 88 | ||
89 | DBG("index[%02X] value[%02X]\n", index, value); | 89 | DBG("index[%02X] value[%02X]\n", index, value); |
90 | return value; | 90 | return value; |
@@ -97,8 +97,8 @@ static u8 get_indexed_reg(ide_hwif_t *hwif, u8 index) | |||
97 | */ | 97 | */ |
98 | static void set_indexed_reg(ide_hwif_t *hwif, u8 index, u8 value) | 98 | static void set_indexed_reg(ide_hwif_t *hwif, u8 index, u8 value) |
99 | { | 99 | { |
100 | outb(index, hwif->dma_vendor1); | 100 | outb(index, hwif->dma_base + 1); |
101 | outb(value, hwif->dma_vendor3); | 101 | outb(value, hwif->dma_base + 3); |
102 | DBG("index[%02X] value[%02X]\n", index, value); | 102 | DBG("index[%02X] value[%02X]\n", index, value); |
103 | } | 103 | } |
104 | 104 | ||