summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-07-08 15:21:58 +0200
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-07-08 15:21:58 +0200
commit4660897e6c2daa198fc8e3f47ae2a4aef69c80b0 (patch)
treedf3bf71f08234d6ae7d8a27ffb4eb79b028a91f4
parent4c6c914e4c2e0f91775ce4051b5a800c55175462 (diff)
downloadlinux-4660897e6c2daa198fc8e3f47ae2a4aef69c80b0.tar.gz
linux-4660897e6c2daa198fc8e3f47ae2a4aef69c80b0.tar.bz2
linux-4660897e6c2daa198fc8e3f47ae2a4aef69c80b0.zip
qd65xx: fix PIO mode selection
PIO4 is a maximum PIO mode supported by a driver. Using "255" as a max_mode argument to ide_get_best_pio_mode() could result in wrong timings being used by a driver (for "pio" equal to 5) or OOPS (for "pio" values > 5 && < 255). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Reviewed-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
-rw-r--r--drivers/ide/legacy/qd65xx.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ide/legacy/qd65xx.c b/drivers/ide/legacy/qd65xx.c
index d1414a75b523..7783745dd167 100644
--- a/drivers/ide/legacy/qd65xx.c
+++ b/drivers/ide/legacy/qd65xx.c
@@ -258,8 +258,7 @@ static void qd6580_tune_drive (ide_drive_t *drive, u8 pio)
int recovery_time = 415; /* worst case values from the dos driver */
if (drive->id && !qd_find_disk_type(drive, &active_time, &recovery_time)) {
- pio = ide_get_best_pio_mode(drive, pio, 255, &d);
- pio = min_t(u8, pio, 4);
+ pio = ide_get_best_pio_mode(drive, pio, 4, &d);
switch (pio) {
case 0: break;