diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-03 13:58:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-03 13:58:49 -0700 |
| commit | 9d7542f891f22d16ea1465d19d253888e87f7ad6 (patch) | |
| tree | 5038aa63019138b2e09fa31a53b562bfb77e428c /drivers/ide/pci/amd74xx.c | |
| parent | f744a0547ac5055a3e9eb20bfe7ff29077a32c16 (diff) | |
| parent | d61bcce9c1aa2c9f8a768d73c4c517f81d226725 (diff) | |
| download | kernel_samsung_aries-9d7542f891f22d16ea1465d19d253888e87f7ad6.zip kernel_samsung_aries-9d7542f891f22d16ea1465d19d253888e87f7ad6.tar.gz kernel_samsung_aries-9d7542f891f22d16ea1465d19d253888e87f7ad6.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: ide_scan_pcibus(): check __pci_register_driver return value
ide: pdc202xx_new PLL input clock fix
it821x: fix incorrect SWDMA mask
amd74xx: resume fix
hpt366: use correct enablebits for HPT36x
hpt366: blacklist MAXTOR STM3320620A for UltraDMA/66
ide: Fix a theoretical Ooops case
ide: never called printk statement in ide-taskfile.c::wait_drive_not_busy
Diffstat (limited to 'drivers/ide/pci/amd74xx.c')
| -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 9db1be8..a2be65f 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); |