summaryrefslogtreecommitdiff
path: root/drivers/ide
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2010-01-18 07:22:16 +0000
committerDavid S. Miller <davem@davemloft.net>2010-01-19 01:52:35 -0800
commitbb430611930c526ff9bca991f254b259fc58ed3c (patch)
tree0b97d8f90575b5abad3cfdf85632f0a0d6c2944e /drivers/ide
parent0716302eec10c3a4c3c5110e43a5ac05ac4b2445 (diff)
downloadlinux-3.10-bb430611930c526ff9bca991f254b259fc58ed3c.tar.gz
linux-3.10-bb430611930c526ff9bca991f254b259fc58ed3c.tar.bz2
linux-3.10-bb430611930c526ff9bca991f254b259fc58ed3c.zip
siimage: use ->pio_mode value to determine pair device speed
Use the current PIO mode value instead of the physical maximum one of the pair device on the port to determine PIO commmand timings used for both devices on the port. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/siimage.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/siimage.c b/drivers/ide/siimage.c
index 2009ac2ff65..ddeda444a27 100644
--- a/drivers/ide/siimage.c
+++ b/drivers/ide/siimage.c
@@ -258,7 +258,7 @@ static void sil_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
/* trim *taskfile* PIO to the slowest of the master/slave */
if (pair) {
- u8 pair_pio = ide_get_best_pio_mode(pair, 255, 4);
+ u8 pair_pio = pair->pio_mode - XFER_PIO_0;
if (pair_pio < tf_pio)
tf_pio = pair_pio;