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

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);