Commit 7a38f3cf authored by Borislav Petkov's avatar Borislav Petkov Committed by Bartlomiej Zolnierkiewicz
Browse files

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



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

Signed-off-by: default avatarBorislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 744a82b0

drivers/ide/ide-cd.c

+7 −14
Original line number Diff line number Diff line
@@ -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__);



	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;

	/* 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) {

		/* ok, next interrupt will be DMA interrupt */

		if (drive->dma)

			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 */