diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-10 03:25:29 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-10 03:25:29 -0400 |
| commit | 8eb95f28f66b1a5461fdbcc9a1ee9068fb2cf2b6 (patch) | |
| tree | e42d0e004b07f86d38de930fc163f3ca7d121f9c /drivers/ide/ide-dma.c | |
| parent | d7451fca18e2ec62641ae4bbfe946069f13765a3 (diff) | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
Merge commit 'v2.6.27' into timers/hpet
Diffstat (limited to 'drivers/ide/ide-dma.c')
| -rw-r--r-- | drivers/ide/ide-dma.c | 2 |
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) | |||
| 211 | xcount = bcount & 0xffff; | 211 | xcount = bcount & 0xffff; |
| 212 | if (is_trm290) | 212 | if (is_trm290) |
| 213 | xcount = ((xcount >> 2) - 1) << 16; | 213 | xcount = ((xcount >> 2) - 1) << 16; |
| 214 | if (xcount == 0x0000) { | 214 | else if (xcount == 0x0000) { |
| 215 | /* | 215 | /* |
| 216 | * Most chipsets correctly interpret a length of 0x0000 as 64KB, | 216 | * Most chipsets correctly interpret a length of 0x0000 as 64KB, |
| 217 | * but at least one (e.g. CS5530) misinterprets it as zero (!). | 217 | * but at least one (e.g. CS5530) misinterprets it as zero (!). |