Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f76bee16 authored by Roel Kluin's avatar Roel Kluin Committed by Bartlomiej Zolnierkiewicz
Browse files

atiixp: fix missing parentheses 



Fix missing parentheses so PIO/DMA timings for master device on the
second channel are programmed correctly (IOW "8 0 24 16" offset values
should be used instead of the current "8 0 16 16").

[ The bug went unnoticed because after PIO/DMA timings get programmed
  incorrectly for the third device they are overwritten with timings
  for the fourth device and since BIOS should also program timings for
  the third device everything should work fine until suspend/resume
  cycle or user requested transfer mode changes. ]

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
[bart: update patch description]
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 43a12216

drivers/ide/atiixp.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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);

	struct pci_dev *dev = to_pci_dev(drive->hwif->dev);

	unsigned long flags;

	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;

	u32 pio_timing_data;

	u16 pio_mode_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);

	struct pci_dev *dev = to_pci_dev(drive->hwif->dev);

	unsigned long flags;

	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;

	u32 tmp32;

	u16 tmp16;

	u16 tmp16;

	u16 udma_ctl = 0;

	u16 udma_ctl = 0;