From: Bartlomiej Zolnierkiewicz Date: Sat, 13 Oct 2007 15:47:51 +0000 (+0200) Subject: au1xxx: fix au1xxx_set_pio_mode() X-Git-Tag: v2.6.24-rc1~1363^2~11 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f458943e0247906b7a3f534f9e9e7ff3d901296;p=linux-2.6 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 Signed-off-by: Bartlomiej Zolnierkiewicz --- diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c index 85819ae206..c319f61631 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)