diff options
Diffstat (limited to 'drivers/ide/pci/hpt34x.c')
-rw-r--r-- | drivers/ide/pci/hpt34x.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c index 88472e5a3ec7..44ac0e2f7a09 100644 --- a/drivers/ide/pci/hpt34x.c +++ b/drivers/ide/pci/hpt34x.c | |||
@@ -127,8 +127,6 @@ static void __devinit init_hwif_hpt34x(ide_hwif_t *hwif) | |||
127 | { | 127 | { |
128 | u16 pcicmd = 0; | 128 | u16 pcicmd = 0; |
129 | 129 | ||
130 | hwif->autodma = 0; | ||
131 | |||
132 | hwif->set_pio_mode = &hpt34x_set_pio_mode; | 130 | hwif->set_pio_mode = &hpt34x_set_pio_mode; |
133 | hwif->set_dma_mode = &hpt34x_set_mode; | 131 | hwif->set_dma_mode = &hpt34x_set_mode; |
134 | 132 | ||
@@ -141,15 +139,13 @@ static void __devinit init_hwif_hpt34x(ide_hwif_t *hwif) | |||
141 | return; | 139 | return; |
142 | 140 | ||
143 | #ifdef CONFIG_HPT34X_AUTODMA | 141 | #ifdef CONFIG_HPT34X_AUTODMA |
142 | if ((pcicmd & PCI_COMMAND_MEMORY) == 0) | ||
143 | return; | ||
144 | |||
144 | hwif->ultra_mask = 0x07; | 145 | hwif->ultra_mask = 0x07; |
145 | hwif->mwdma_mask = 0x07; | 146 | hwif->mwdma_mask = 0x07; |
146 | hwif->swdma_mask = 0x07; | 147 | hwif->swdma_mask = 0x07; |
147 | #endif | 148 | #endif |
148 | |||
149 | if (!noautodma) | ||
150 | hwif->autodma = (pcicmd & PCI_COMMAND_MEMORY) ? 1 : 0; | ||
151 | hwif->drives[0].autodma = hwif->autodma; | ||
152 | hwif->drives[1].autodma = hwif->autodma; | ||
153 | } | 149 | } |
154 | 150 | ||
155 | static ide_pci_device_t hpt34x_chipset __devinitdata = { | 151 | static ide_pci_device_t hpt34x_chipset __devinitdata = { |