diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 00:15:35 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 00:15:35 -0800 |
| commit | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (patch) | |
| tree | 99e5b423473097756353d038f922b2623f3edd2a /drivers/ide/ide-cd.c | |
| parent | 1bded710a574f20d41bc9e7fb531301db282d623 (diff) | |
| parent | fb53fde9762432d091dac209bdf4f3f850117c55 (diff) | |
| download | kernel_samsung_smdk4412-b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15.zip kernel_samsung_smdk4412-b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15.tar.gz kernel_samsung_smdk4412-b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/Kconfig
Diffstat (limited to 'drivers/ide/ide-cd.c')
| -rw-r--r-- | drivers/ide/ide-cd.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index cae6937..0bfeb0c 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c @@ -787,6 +787,9 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive) if (blk_fs_request(rq)) { ide_end_request(drive, 1, rq->nr_sectors); return ide_stopped; + } else if (rq->cmd_type == REQ_TYPE_ATA_PC && !rq->bio) { + ide_end_request(drive, 1, 1); + return ide_stopped; } goto end_request; } |