diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-17 12:09:18 -0400 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-10-17 12:09:18 -0400 |
| commit | 769b49ce68386b21e45bb6e573b63c02020b17a1 (patch) | |
| tree | 673f8c3085cb7dfe3a40d8d669c02d4ff6f1a131 /drivers/ide | |
| parent | a11e2afa77b9e1ddffc63e37cae5685683558870 (diff) | |
ide: re-add TRM290 fix lost during ide_build_dmatable() cleanup
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 <sshtylyov@ru.mvista.com>
Acked-by: Sergei Shtylylov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/ide-dma-sff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-dma-sff.c b/drivers/ide/ide-dma-sff.c index 0903782689e9..cac431f0df17 100644 --- 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) | |||
| 130 | xcount = bcount & 0xffff; | 130 | xcount = bcount & 0xffff; |
| 131 | if (is_trm290) | 131 | if (is_trm290) |
| 132 | xcount = ((xcount >> 2) - 1) << 16; | 132 | xcount = ((xcount >> 2) - 1) << 16; |
| 133 | if (xcount == 0x0000) { | 133 | else if (xcount == 0x0000) { |
| 134 | if (count++ >= PRD_ENTRIES) | 134 | if (count++ >= PRD_ENTRIES) |
| 135 | goto use_pio_instead; | 135 | goto use_pio_instead; |
| 136 | *table++ = cpu_to_le32(0x8000); | 136 | *table++ = cpu_to_le32(0x8000); |