diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-13 19:47:51 +0400 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-13 19:47:51 +0400 |
| commit | 0f458943e0247906b7a3f534f9e9e7ff3d901296 (patch) | |
| tree | 4ffba3988a8f88716d13986ee093a444b295496b /drivers/ide | |
| parent | 75d7d963e3dcf8a1410000ab246921709e276cd9 (diff) | |
| download | linux-0f458943e0247906b7a3f534f9e9e7ff3d901296.tar.xz | |
au1xxx: fix au1xxx_set_pio_mode()
Set transfer mode on the device before programming the host controller for
the new timings (matches what auide_tune_chipset() is doing wrt DMA modes).
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/mips/au1xxx-ide.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c index 85819ae20602..c319f6163127 100644 --- a/drivers/ide/mips/au1xxx-ide.c +++ b/drivers/ide/mips/au1xxx-ide.c @@ -103,7 +103,9 @@ static void au1xxx_set_pio_mode(ide_drive_t *drive, const u8 pio) { int mem_sttime; int mem_stcfg; - u8 speed; + + if (ide_config_drive_speed(drive, pio + XFER_PIO_0)) + return; mem_sttime = 0; mem_stcfg = au_readl(MEM_STCFG2); @@ -164,9 +166,6 @@ static void au1xxx_set_pio_mode(ide_drive_t *drive, const u8 pio) au_writel(mem_sttime,MEM_STTIME2); au_writel(mem_stcfg,MEM_STCFG2); - - speed = pio + XFER_PIO_0; - ide_config_drive_speed(drive, speed); } static int auide_tune_chipset(ide_drive_t *drive, const u8 speed) |