diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-07-03 22:28:35 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-07-03 22:28:35 +0200 |
| commit | 603a0e2c0a160ad8c2d00d71a700bb95482be5de (patch) | |
| tree | 1abb83b6ffad52ab0bfde2c5f9a11f826ac096d1 | |
| parent | 96dcc08b0c6b730474469b10ed5eeda06e617deb (diff) | |
| download | blackbird-op-linux-603a0e2c0a160ad8c2d00d71a700bb95482be5de.tar.gz blackbird-op-linux-603a0e2c0a160ad8c2d00d71a700bb95482be5de.zip | |
amd74xx: resume fix
* Driver can't skip programming transfer mode on the device in amd_set_drive()
(similar fix has been applied to via82cxxx driver ages ago).
* While at it remove redundant warning (ide_config_drive_speed() already
produces more valuable one).
* Bump driver version.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
| -rw-r--r-- | drivers/ide/pci/amd74xx.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c index 9db1be826e80..a2be65fcf89c 100644 --- a/drivers/ide/pci/amd74xx.c +++ b/drivers/ide/pci/amd74xx.c @@ -1,5 +1,5 @@ /* - * Version 2.15 + * Version 2.16 * * AMD 755/756/766/8111 and nVidia nForce/2/2s/3/3s/CK804/MCP04 * IDE driver for Linux. @@ -244,10 +244,8 @@ static int amd_set_drive(ide_drive_t *drive, u8 speed) struct ide_timing t, p; int T, UT; - if (speed != XFER_PIO_SLOW && speed != drive->current_speed) - if (ide_config_drive_speed(drive, speed)) - printk(KERN_WARNING "ide%d: Drive %d didn't accept speed setting. Oh, well.\n", - drive->dn >> 1, drive->dn & 1); + if (speed != XFER_PIO_SLOW) + ide_config_drive_speed(drive, speed); T = 1000000000 / amd_clock; UT = T / min_t(int, max_t(int, amd_config->flags & AMD_UDMA, 1), 2); |
