diff options
| -rw-r--r-- | drivers/ide/pci/serverworks.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c index 011245246b1f..abc3cd58aaa9 100644 --- a/drivers/ide/pci/serverworks.c +++ b/drivers/ide/pci/serverworks.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/drivers/ide/pci/serverworks.c Version 0.21 Jun 16 2007 | 2 | * linux/drivers/ide/pci/serverworks.c Version 0.22 Jun 27 2007 |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1998-2000 Michel Aubry | 4 | * Copyright (C) 1998-2000 Michel Aubry |
| 5 | * Copyright (C) 1998-2000 Andrzej Krzysztofowicz | 5 | * Copyright (C) 1998-2000 Andrzej Krzysztofowicz |
| @@ -387,8 +387,6 @@ static u8 __devinit ata66_svwks(ide_hwif_t *hwif) | |||
| 387 | 387 | ||
| 388 | static void __devinit init_hwif_svwks (ide_hwif_t *hwif) | 388 | static void __devinit init_hwif_svwks (ide_hwif_t *hwif) |
| 389 | { | 389 | { |
| 390 | u8 dma_stat = 0; | ||
| 391 | |||
| 392 | if (!hwif->irq) | 390 | if (!hwif->irq) |
| 393 | hwif->irq = hwif->channel ? 15 : 14; | 391 | hwif->irq = hwif->channel ? 15 : 14; |
| 394 | 392 | ||
| @@ -419,9 +417,7 @@ static void __devinit init_hwif_svwks (ide_hwif_t *hwif) | |||
| 419 | if (!noautodma) | 417 | if (!noautodma) |
| 420 | hwif->autodma = 1; | 418 | hwif->autodma = 1; |
| 421 | 419 | ||
| 422 | dma_stat = inb(hwif->dma_status); | 420 | hwif->drives[0].autodma = hwif->drives[1].autodma = 1; |
| 423 | hwif->drives[0].autodma = (dma_stat & 0x20); | ||
| 424 | hwif->drives[1].autodma = (dma_stat & 0x40); | ||
| 425 | } | 421 | } |
| 426 | 422 | ||
| 427 | static int __devinit init_setup_svwks (struct pci_dev *dev, ide_pci_device_t *d) | 423 | static int __devinit init_setup_svwks (struct pci_dev *dev, ide_pci_device_t *d) |
