lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ide-cd: wait for DRQ to get set per default

Browse Source 
... instead of assuming it is set for accelerated DRQ type devices.

Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Borislav Petkov
2009-01-06 17:20:57 +01:00
committed by Bartlomiej Zolnierkiewicz
parent 744a82b004
commit 7a38f3cf01
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/ide/ide-cd.c
View File

@@ -572,24 +572,17 @@ static ide_startstop_t cdrom_transfer_packet_command(ide_drive_t *drive)
ide_debug_log(IDE_DBG_PC, "Call %s\n", __func__); ide_debug_log(IDE_DBG_PC, "Call %s\n", __func__);
/* we must wait for DRQ to get set */
if (ide_wait_stat(&startstop, drive, ATA_DRQ, ATA_BUSY, WAIT_READY)) {
printk(KERN_ERR "%s: timeout while waiting for DRQ to assert\n",
drive->name);
return startstop;
}
if (drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT) { if (drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT) {
/*
* Here we should have been called after receiving an interrupt
* from the device. DRQ should how be set.
*/
/* check for errors */
if (cdrom_decode_status(drive, ATA_DRQ, NULL))
return ide_stopped;
/* ok, next interrupt will be DMA interrupt */ /* ok, next interrupt will be DMA interrupt */
if (drive->dma) if (drive->dma)
drive->waiting_for_dma = 1; drive->waiting_for_dma = 1;
} else {
/* otherwise, we must wait for DRQ to get set */
if (ide_wait_stat(&startstop, drive, ATA_DRQ,
ATA_BUSY, WAIT_READY))
return startstop;
} }
/* arm the interrupt handler */ /* arm the interrupt handler */