diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-07 13:17:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-07 13:17:59 -0800 |
| commit | bb641ab496d5b8eb835ae1933926fdf23feb5260 (patch) | |
| tree | 12d8437158fd16b58fc324fb7e2f8781e2463a9c /drivers/ide/ide-cd_ioctl.c | |
| parent | 4c1aa6f8b9686ddc7221f0f3b63f9b7dd1467543 (diff) | |
| parent | 1c10e93828f8861c3f58d647e259de0e2c63b930 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: update references to Documentation/ide/ide.txt (v2)
ide: move ide.txt to Documentation/ide/
ide: fix buggy code in ide_register_hw()
ide: fix enabling DMA on it821x in "smart" mode
ide-cd: mark REQ_TYPE_ATA_PC write requests with REQ_RW flag
Diffstat (limited to 'drivers/ide/ide-cd_ioctl.c')
| -rw-r--r-- | drivers/ide/ide-cd_ioctl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ide/ide-cd_ioctl.c b/drivers/ide/ide-cd_ioctl.c index b68284de4e8..6d147ce6782 100644 --- a/drivers/ide/ide-cd_ioctl.c +++ b/drivers/ide/ide-cd_ioctl.c @@ -457,6 +457,10 @@ int ide_cdrom_packet(struct cdrom_device_info *cdi, layer. the packet must be complete, as we do not touch it at all. */ ide_cd_init_rq(drive, &req); + + if (cgc->data_direction == CGC_DATA_WRITE) + req.cmd_flags |= REQ_RW; + memcpy(req.cmd, cgc->cmd, CDROM_PACKET_SIZE); if (cgc->sense) memset(cgc->sense, 0, sizeof(struct request_sense)); |