Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 61894
b: refs/heads/master
c: 1c164ac
h: refs/heads/master
v: v3
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Jul 19, 2007
1 parent 906069f commit 0bd31a4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1880a8d7f2d0587e657e3292166003636067b7ea
refs/heads/master: 1c164acf50146d8a82caed642951390e073620f1
8 changes: 2 additions & 6 deletions trunk/drivers/ide/pci/serverworks.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* linux/drivers/ide/pci/serverworks.c Version 0.21 Jun 16 2007
* linux/drivers/ide/pci/serverworks.c Version 0.22 Jun 27 2007
*
* Copyright (C) 1998-2000 Michel Aubry
* Copyright (C) 1998-2000 Andrzej Krzysztofowicz
Expand Down Expand Up @@ -387,8 +387,6 @@ static u8 __devinit ata66_svwks(ide_hwif_t *hwif)

static void __devinit init_hwif_svwks (ide_hwif_t *hwif)
{
u8 dma_stat = 0;

if (!hwif->irq)
hwif->irq = hwif->channel ? 15 : 14;

Expand Down Expand Up @@ -419,9 +417,7 @@ static void __devinit init_hwif_svwks (ide_hwif_t *hwif)
if (!noautodma)
hwif->autodma = 1;

dma_stat = inb(hwif->dma_status);
hwif->drives[0].autodma = (dma_stat & 0x20);
hwif->drives[1].autodma = (dma_stat & 0x40);
hwif->drives[0].autodma = hwif->drives[1].autodma = 1;
}

static int __devinit init_setup_svwks (struct pci_dev *dev, ide_pci_device_t *d)
Expand Down

0 comments on commit 0bd31a4

Please sign in to comment.