diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2005-05-25 17:58:04 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-05-25 17:58:04 -0400 |
| commit | 4b463f785837f73bdd88ae3821bb7b69599010c9 (patch) | |
| tree | 80dc0a7e3e33596ff3ece410d9ff9e6b63e45b87 /drivers/ide | |
| parent | 6df16d0c35b9c0d3627f30c106e6142d3d12662b (diff) | |
| parent | 384f1fcd2db8bc5a15f20f10793d8e1c82acd6c5 (diff) | |
Merge of /home/davem/src/GIT/linux-2.6/.git/
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/ide-cd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 33a020faeabd..4f7ce7056228 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
| @@ -1933,7 +1933,7 @@ static ide_startstop_t cdrom_do_block_pc(ide_drive_t *drive, struct request *rq) | |||
| 1933 | /* | 1933 | /* |
| 1934 | * check if dma is safe | 1934 | * check if dma is safe |
| 1935 | */ | 1935 | */ |
| 1936 | if ((rq->data_len & mask) || (addr & mask)) | 1936 | if ((rq->data_len & 3) || (addr & mask)) |
| 1937 | info->dma = 0; | 1937 | info->dma = 0; |
| 1938 | } | 1938 | } |
| 1939 | 1939 | ||