projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a11e2af
)
ide: re-add TRM290 fix lost during ide_build_dmatable() cleanup
author
Bartlomiej Zolnierkiewicz
<
[email protected]
>
Fri, 17 Oct 2008 16:09:18 +0000
(18:09 +0200)
committer
Bartlomiej Zolnierkiewicz
<
[email protected]
>
Fri, 17 Oct 2008 16:09:18 +0000
(18:09 +0200)
commit
14c123f37187aba0b4e0e893a969efc6820c4170
("ide: cleanup
ide_build_dmatable()") accidentally reverted TRM290 fix introduced
by commit
22e05b4549bf2405d6aca128540b20cd2dd33f1f
("ide-dma: fix
ide_build_dmatable() for TRM290").
Reported-by: Sergei Shtylylov <
[email protected]
>
Acked-by: Sergei Shtylylov <
[email protected]
>
Signed-off-by: Bartlomiej Zolnierkiewicz <
[email protected]
>
drivers/ide/ide-dma-sff.c
patch
|
blob
|
history
diff --git
a/drivers/ide/ide-dma-sff.c
b/drivers/ide/ide-dma-sff.c
index 0903782689e9753db304ea9d63fc6be61a386cc3..cac431f0df1769eda7e4f2d7fe28d7f8914602db 100644
(file)
--- a/
drivers/ide/ide-dma-sff.c
+++ b/
drivers/ide/ide-dma-sff.c
@@
-130,7
+130,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) {
if (count++ >= PRD_ENTRIES)
goto use_pio_instead;
*table++ = cpu_to_le32(0x8000);