summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-dma.c
diff options
context:
space:
mode:
authorSergei Shtylylov <sshtylyov@ru.mvista.com>2008-10-05 18:23:27 +0200
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-10-05 18:23:27 +0200
commit22e05b4549bf2405d6aca128540b20cd2dd33f1f (patch)
tree9bf72e944f5fb7ae2c4691a76c53e4cba0c9aff9 /drivers/ide/ide-dma.c
parentf20f258603ebc5da91e76884cf0c0d7ac9804b1c (diff)
downloadlinux-22e05b4549bf2405d6aca128540b20cd2dd33f1f.tar.gz
linux-22e05b4549bf2405d6aca128540b20cd2dd33f1f.tar.bz2
linux-22e05b4549bf2405d6aca128540b20cd2dd33f1f.zip
ide-dma: fix ide_build_dmatable() for TRM290
Apparently, 'xcount' being 0 does not mean 0 bytes for TRM290; it means 4 bytes, judging from the code immediately preceding this check. So, we must never try to "split" the PRD for TRM290. This is probably never hit anyway -- with the DMA buffers aligned to at least 512 bytes and ATAPI DMA not being used for non block I/O commands... Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-dma.c')
-rw-r--r--drivers/ide/ide-dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index adc682755857..3fa07c0aeaa4 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -211,7 +211,7 @@ int ide_build_dmatable (ide_drive_t *drive, struct request *rq)
xcount = bcount & 0xffff;
if (is_trm290)
xcount = ((xcount >> 2) - 1) << 16;
- if (xcount == 0x0000) {
+ else if (xcount == 0x0000) {
/*
* Most chipsets correctly interpret a length of 0x0000 as 64KB,
* but at least one (e.g. CS5530) misinterprets it as zero (!).