diff options
Diffstat (limited to 'drivers/ide/pci/sgiioc4.c')
-rw-r--r-- | drivers/ide/pci/sgiioc4.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c index 9a9474f534e5..5af74ea1d46e 100644 --- a/drivers/ide/pci/sgiioc4.c +++ b/drivers/ide/pci/sgiioc4.c | |||
@@ -592,8 +592,7 @@ ide_init_sgiioc4(ide_hwif_t * hwif) | |||
592 | if (hwif->dma_base == 0) | 592 | if (hwif->dma_base == 0) |
593 | return; | 593 | return; |
594 | 594 | ||
595 | hwif->atapi_dma = 1; | 595 | hwif->mwdma_mask = ATA_MWDMA2_ONLY; |
596 | hwif->mwdma_mask = 0x04; | ||
597 | 596 | ||
598 | hwif->dma_setup = &sgiioc4_ide_dma_setup; | 597 | hwif->dma_setup = &sgiioc4_ide_dma_setup; |
599 | hwif->dma_start = &sgiioc4_ide_dma_start; | 598 | hwif->dma_start = &sgiioc4_ide_dma_start; |
@@ -692,14 +691,12 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev) | |||
692 | static unsigned int __devinit | 691 | static unsigned int __devinit |
693 | pci_init_sgiioc4(struct pci_dev *dev) | 692 | pci_init_sgiioc4(struct pci_dev *dev) |
694 | { | 693 | { |
695 | unsigned int class_rev; | ||
696 | int ret; | 694 | int ret; |
697 | 695 | ||
698 | pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev); | ||
699 | class_rev &= 0xff; | ||
700 | printk(KERN_INFO "%s: IDE controller at PCI slot %s, revision %d\n", | 696 | printk(KERN_INFO "%s: IDE controller at PCI slot %s, revision %d\n", |
701 | DRV_NAME, pci_name(dev), class_rev); | 697 | DRV_NAME, pci_name(dev), dev->revision); |
702 | if (class_rev < IOC4_SUPPORTED_FIRMWARE_REV) { | 698 | |
699 | if (dev->revision < IOC4_SUPPORTED_FIRMWARE_REV) { | ||
703 | printk(KERN_ERR "Skipping %s IDE controller in slot %s: " | 700 | printk(KERN_ERR "Skipping %s IDE controller in slot %s: " |
704 | "firmware is obsolete - please upgrade to " | 701 | "firmware is obsolete - please upgrade to " |
705 | "revision46 or higher\n", | 702 | "revision46 or higher\n", |