Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 56861
b: refs/heads/master
c: 585a285
h: refs/heads/master
i:
  56859: e18ca26
v: v3
  • Loading branch information
Andrew Morton authored and Bartlomiej Zolnierkiewicz committed May 24, 2007
1 parent 4d9eb53 commit b0d1450
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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: 5a6248cac22a77588f81c7473cfd03d250cc5b56
refs/heads/master: 585a2858b970cb6e2e5ca4877eefd18b4dba8ed4
8 changes: 4 additions & 4 deletions trunk/drivers/ide/pci/serverworks.c
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ static int svwks_tune_chipset (ide_drive_t *drive, u8 xferspeed)
((dma_stat&(1<<(5+unit)))==(1<<(5+unit)))) {
u8 dmaspeed = dma_timing;

dma_timing &= ~0xFF;
dma_timing &= ~0xFFU;
if ((dmaspeed & 0x20) == 0x20)
dmaspeed = XFER_MW_DMA_2;
else if ((dmaspeed & 0x21) == 0x21)
Expand All @@ -193,7 +193,7 @@ static int svwks_tune_chipset (ide_drive_t *drive, u8 xferspeed)
} else if (pio_timing) {
u8 piospeed = pio_timing;

pio_timing &= ~0xFF;
pio_timing &= ~0xFFU;
if ((piospeed & 0x20) == 0x20)
piospeed = XFER_PIO_4;
else if ((piospeed & 0x22) == 0x22)
Expand All @@ -214,8 +214,8 @@ static int svwks_tune_chipset (ide_drive_t *drive, u8 xferspeed)

oem_setup_failed:

pio_timing &= ~0xFF;
dma_timing &= ~0xFF;
pio_timing &= ~0xFFU;
dma_timing &= ~0xFFU;
ultra_timing &= ~(0x0F << (4*unit));
ultra_enable &= ~(0x01 << drive->dn);
csb5_pio &= ~(0x0F << (4*drive->dn));
Expand Down

0 comments on commit b0d1450

Please sign in to comment.