aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/pci')
-rw-r--r--drivers/ide/pci/amd74xx.c8
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 @@
1/* 1/*
2 * Version 2.15 2 * Version 2.16
3 * 3 *
4 * AMD 755/756/766/8111 and nVidia nForce/2/2s/3/3s/CK804/MCP04 4 * AMD 755/756/766/8111 and nVidia nForce/2/2s/3/3s/CK804/MCP04
5 * IDE driver for Linux. 5 * IDE driver for Linux.
@@ -244,10 +244,8 @@ static int amd_set_drive(ide_drive_t *drive, u8 speed)
244 struct ide_timing t, p; 244 struct ide_timing t, p;
245 int T, UT; 245 int T, UT;
246 246
247 if (speed != XFER_PIO_SLOW && speed != drive->current_speed) 247 if (speed != XFER_PIO_SLOW)
248 if (ide_config_drive_speed(drive, speed)) 248 ide_config_drive_speed(drive, speed);
249 printk(KERN_WARNING "ide%d: Drive %d didn't accept speed setting. Oh, well.\n",
250 drive->dn >> 1, drive->dn & 1);
251 249
252 T = 1000000000 / amd_clock; 250 T = 1000000000 / amd_clock;
253 UT = T / min_t(int, max_t(int, amd_config->flags & AMD_UDMA, 1), 2); 251 UT = T / min_t(int, max_t(int, amd_config->flags & AMD_UDMA, 1), 2);