From 887029e2d0f755798b84f34425f3f0f76b07e8d6 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Thu, 12 Oct 2006 15:08:45 +0200 Subject: [PATCH] --- yaml --- r: 39493 b: refs/heads/master c: cea2885a2e989d1dc19af1fc991717b33b7d1456 h: refs/heads/master i: 39491: 8389f89037f24a9abaf9d8ac84e4016a775ac96c v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-cd.c | 5 +++-- trunk/include/linux/blkdev.h | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1cc9329f0444..3f4c02f4168b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5841642242e9ae817275e09b36b298456dc17d2 +refs/heads/master: cea2885a2e989d1dc19af1fc991717b33b7d1456 diff --git a/trunk/drivers/ide/ide-cd.c b/trunk/drivers/ide/ide-cd.c index 69bbb6206a00..e7513e55ace8 100644 --- a/trunk/drivers/ide/ide-cd.c +++ b/trunk/drivers/ide/ide-cd.c @@ -597,7 +597,7 @@ static void cdrom_prepare_request(ide_drive_t *drive, struct request *rq) struct cdrom_info *cd = drive->driver_data; ide_init_drive_cmd(rq); - rq->cmd_type = REQ_TYPE_BLOCK_PC; + rq->cmd_type = REQ_TYPE_ATA_PC; rq->rq_disk = cd->disk; } @@ -2023,7 +2023,8 @@ ide_do_rw_cdrom (ide_drive_t *drive, struct request *rq, sector_t block) } info->last_block = block; return action; - } else if (rq->cmd_type == REQ_TYPE_SENSE) { + } else if (rq->cmd_type == REQ_TYPE_SENSE || + rq->cmd_type == REQ_TYPE_ATA_PC) { return cdrom_do_packet_command(drive); } else if (blk_pc_request(rq)) { return cdrom_do_block_pc(drive, rq); diff --git a/trunk/include/linux/blkdev.h b/trunk/include/linux/blkdev.h index 26f7856ff812..d370d2cfe138 100644 --- a/trunk/include/linux/blkdev.h +++ b/trunk/include/linux/blkdev.h @@ -157,6 +157,7 @@ enum rq_cmd_type_bits { REQ_TYPE_ATA_CMD, REQ_TYPE_ATA_TASK, REQ_TYPE_ATA_TASKFILE, + REQ_TYPE_ATA_PC, }; /*