diff options
| -rw-r--r-- | drivers/ide/pci/alim15x3.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c index ec9fba8ad342..fcd0222ca477 100644 --- a/drivers/ide/pci/alim15x3.c +++ b/drivers/ide/pci/alim15x3.c | |||
| @@ -732,8 +732,6 @@ static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif) | |||
| 732 | 732 | ||
| 733 | static void __devinit init_dma_ali15x3 (ide_hwif_t *hwif, unsigned long dmabase) | 733 | static void __devinit init_dma_ali15x3 (ide_hwif_t *hwif, unsigned long dmabase) |
| 734 | { | 734 | { |
| 735 | if (m5229_revision < 0x20) | ||
| 736 | return; | ||
| 737 | if (!hwif->channel) | 735 | if (!hwif->channel) |
| 738 | outb(inb(dmabase + 2) & 0x60, dmabase + 2); | 736 | outb(inb(dmabase + 2) & 0x60, dmabase + 2); |
| 739 | ide_setup_dma(hwif, dmabase); | 737 | ide_setup_dma(hwif, dmabase); |
| @@ -794,6 +792,10 @@ static int __devinit alim15x3_init_one(struct pci_dev *dev, const struct pci_dev | |||
| 794 | d.udma_mask = ATA_UDMA5; | 792 | d.udma_mask = ATA_UDMA5; |
| 795 | else | 793 | else |
| 796 | d.udma_mask = ATA_UDMA6; | 794 | d.udma_mask = ATA_UDMA6; |
| 795 | } else { | ||
| 796 | d.host_flags |= IDE_HFLAG_NO_DMA; | ||
| 797 | |||
| 798 | d.mwdma_mask = d.swdma_mask = 0; | ||
| 797 | } | 799 | } |
| 798 | 800 | ||
| 799 | if (idx == 0) | 801 | if (idx == 0) |
