summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2010-01-19 20:30:09 +0100
committerDavid S. Miller <davem@davemloft.net>2010-01-19 20:30:09 +0100
commit3dabcfef3e668f6dd32147d810a29ccbd55dc963 (patch)
tree13c8735dad44277edd2f8efe6b446eb95a6038cd
parentide: make ide_get_best_pio_mode() static (diff)
downloadlinux-3dabcfef3e668f6dd32147d810a29ccbd55dc963.tar.xz
linux-3dabcfef3e668f6dd32147d810a29ccbd55dc963.zip
ide: ide_timing_compute() fixup
XFER_SW_DMA_0 mode should be excluded from the extended cycle timing computations. [ This is just a documentation fix -- code inside the affected 'if' block already makes sure to accept only PIO modes. ] Noticed-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/ide/ide-timings.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-timings.c b/drivers/ide/ide-timings.c
index c7a65ee72310..0e05f75934c9 100644
--- a/drivers/ide/ide-timings.c
+++ b/drivers/ide/ide-timings.c
@@ -166,7 +166,7 @@ int ide_timing_compute(ide_drive_t *drive, u8 speed,
if (id[ATA_ID_FIELD_VALID] & 2) { /* EIDE drive */
memset(&p, 0, sizeof(p));
- if (speed >= XFER_PIO_0 && speed <= XFER_SW_DMA_0) {
+ if (speed >= XFER_PIO_0 && speed < XFER_SW_DMA_0) {
if (speed <= XFER_PIO_2)
p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO];
else if ((speed <= XFER_PIO_4) ||