projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d68b862
)
ide-cd: revert DMA mask test change
author
Linus Torvalds
<torvalds@ppc970.osdl.org>
Fri, 27 May 2005 14:36:17 +0000
(07:36 -0700)
committer
Linus Torvalds
<torvalds@ppc970.osdl.org>
Fri, 27 May 2005 14:36:17 +0000
(07:36 -0700)
The change to require the DMA length to be only word-aligned was not
safe.
drivers/ide/ide-cd.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/ide/ide-cd.c
b/drivers/ide/ide-cd.c
index f0bd242e030f2e0f45b1bdf45cb99ae0c3e33b79..78e3e7b24d7d62fb12bb2736f001d95894b1d42b 100644
(file)
--- a/
drivers/ide/ide-cd.c
+++ b/
drivers/ide/ide-cd.c
@@
-1932,8
+1932,11
@@
static ide_startstop_t cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
/*
* check if dma is safe
+ *
+ * NOTE! The "len" and "addr" checks should possibly have
+ * separate masks.
*/
- if ((rq->data_len &
3
) || (addr & mask))
+ if ((rq->data_len &
mask
) || (addr & mask))
info->dma = 0;
}