diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-27 10:36:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-27 10:36:17 -0400 |
commit | 5d9e4ea55ae19f9083b9c2c97cc912b823ee7ab4 (patch) | |
tree | 1ffe2c5546d3891f72f4235a788240a520a2db02 /drivers/ide | |
parent | d68b8622ccbee8a18e495ad1650c3306f2eeb0d6 (diff) |
ide-cd: revert DMA mask test change
The change to require the DMA length to be only word-aligned was not
safe.
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ide-cd.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index f0bd242e030f..78e3e7b24d7d 100644 --- 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) | |||
1932 | 1932 | ||
1933 | /* | 1933 | /* |
1934 | * check if dma is safe | 1934 | * check if dma is safe |
1935 | * | ||
1936 | * NOTE! The "len" and "addr" checks should possibly have | ||
1937 | * separate masks. | ||
1935 | */ | 1938 | */ |
1936 | if ((rq->data_len & 3) || (addr & mask)) | 1939 | if ((rq->data_len & mask) || (addr & mask)) |
1937 | info->dma = 0; | 1940 | info->dma = 0; |
1938 | } | 1941 | } |
1939 | 1942 | ||