From c24e8f37117edc89fd6a31d732068b62e9d66d2b Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Sat, 13 Oct 2007 17:47:51 +0200 Subject: [PATCH] --- yaml --- r: 68562 b: refs/heads/master c: 3b4024d4297279ef85631f3c19a6fa4312b4c401 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ide/pci/amd74xx.c | 10 +++------- trunk/drivers/ide/pci/via82cxxx.c | 10 +++------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index f2060c373ec7..2fb8a431ca37 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f458943e0247906b7a3f534f9e9e7ff3d901296 +refs/heads/master: 3b4024d4297279ef85631f3c19a6fa4312b4c401 diff --git a/trunk/drivers/ide/pci/amd74xx.c b/trunk/drivers/ide/pci/amd74xx.c index 513205e52ad2..71d2c670e97e 100644 --- a/trunk/drivers/ide/pci/amd74xx.c +++ b/trunk/drivers/ide/pci/amd74xx.c @@ -1,5 +1,5 @@ /* - * Version 2.22 + * Version 2.23 * * AMD 755/756/766/8111 and nVidia nForce/2/2s/3/3s/CK804/MCP04 * IDE driver for Linux. @@ -240,8 +240,8 @@ static int amd_set_drive(ide_drive_t *drive, const u8 speed) struct ide_timing t, p; int T, UT; - if (speed != XFER_PIO_SLOW) - ide_config_drive_speed(drive, speed); + if (ide_config_drive_speed(drive, speed)) + return 1; T = 1000000000 / amd_clock; UT = (amd_config->udma_mask == ATA_UDMA2) ? T : (T / 2); @@ -258,10 +258,6 @@ static int amd_set_drive(ide_drive_t *drive, const u8 speed) amd_set_speed(HWIF(drive)->pci_dev, drive->dn, &t); - if (!drive->init_speed) - drive->init_speed = speed; - drive->current_speed = speed; - return 0; } diff --git a/trunk/drivers/ide/pci/via82cxxx.c b/trunk/drivers/ide/pci/via82cxxx.c index 378feb491ec4..ac094e51d2bf 100644 --- a/trunk/drivers/ide/pci/via82cxxx.c +++ b/trunk/drivers/ide/pci/via82cxxx.c @@ -1,6 +1,6 @@ /* * - * Version 3.48 + * Version 3.49 * * VIA IDE driver for Linux. Supported southbridges: * @@ -165,8 +165,8 @@ static int via_set_drive(ide_drive_t *drive, const u8 speed) struct ide_timing t, p; unsigned int T, UT; - if (speed != XFER_PIO_SLOW) - ide_config_drive_speed(drive, speed); + if (ide_config_drive_speed(drive, speed)) + return 1; T = 1000000000 / via_clock; @@ -187,10 +187,6 @@ static int via_set_drive(ide_drive_t *drive, const u8 speed) via_set_speed(HWIF(drive), drive->dn, &t); - if (!drive->init_speed) - drive->init_speed = speed; - drive->current_speed = speed; - return 0; }