diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-06-02 18:43:09 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-02 18:43:09 -0400 |
| commit | d7aaf48128ec7fcefcee92ea22833afc1a80e268 (patch) | |
| tree | 16ff78f6be6a5519944bb7bfc6034dfbd71ae97f /drivers/ide/ide-cd.c | |
| parent | decc6d0b68f27bbb8a0357fccf41936a3c196b03 (diff) | |
| parent | 1e86d1c648508fd50e6c9960576b87906a7906ad (diff) | |
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
Diffstat (limited to 'drivers/ide/ide-cd.c')
| -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 78e3e7b24d7d..39f3e9101ed4 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
| @@ -1936,7 +1936,7 @@ static ide_startstop_t cdrom_do_block_pc(ide_drive_t *drive, struct request *rq) | |||
| 1936 | * NOTE! The "len" and "addr" checks should possibly have | 1936 | * NOTE! The "len" and "addr" checks should possibly have |
| 1937 | * separate masks. | 1937 | * separate masks. |
| 1938 | */ | 1938 | */ |
| 1939 | if ((rq->data_len & mask) || (addr & mask)) | 1939 | if ((rq->data_len & 15) || (addr & mask)) |
| 1940 | info->dma = 0; | 1940 | info->dma = 0; |
| 1941 | } | 1941 | } |
| 1942 | 1942 | ||