diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-28 15:36:58 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-28 15:36:58 -0800 |
| commit | 18963caaf55240d6a0491bdb27b7fef2882ffb15 (patch) | |
| tree | d0e4365cae0ce401ba826809f4eef0bd755f4f2d /drivers/ide/atiixp.c | |
| parent | 98f8948f13b4d27c3695c49ac9a970a77166f9ee (diff) | |
| parent | 778ef1e6cbb049c9bcbf405936ee6f2b6e451892 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/ide/atiixp.c')
| -rw-r--r-- | drivers/ide/atiixp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/atiixp.c b/drivers/ide/atiixp.c index b2735d28f5cc..ecd1e62ca91a 100644 --- a/drivers/ide/atiixp.c +++ b/drivers/ide/atiixp.c @@ -52,7 +52,7 @@ static void atiixp_set_pio_mode(ide_drive_t *drive, const u8 pio) { struct pci_dev *dev = to_pci_dev(drive->hwif->dev); unsigned long flags; - int timing_shift = (drive->dn & 2) ? 16 : 0 + (drive->dn & 1) ? 0 : 8; + int timing_shift = (drive->dn ^ 1) * 8; u32 pio_timing_data; u16 pio_mode_data; @@ -85,7 +85,7 @@ static void atiixp_set_dma_mode(ide_drive_t *drive, const u8 speed) { struct pci_dev *dev = to_pci_dev(drive->hwif->dev); unsigned long flags; - int timing_shift = (drive->dn & 2) ? 16 : 0 + (drive->dn & 1) ? 0 : 8; + int timing_shift = (drive->dn ^ 1) * 8; u32 tmp32; u16 tmp16; u16 udma_ctl = 0; |