Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d977e43 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: check BUSY and ERROR status bits before reading data in drive_cmd_intr() 



Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 18a056fe

drivers/ide/ide-io.c

+8 −3
Original line number Diff line number Diff line
@@ -643,8 +643,13 @@ static ide_startstop_t drive_cmd_intr (ide_drive_t *drive) 
	if (pio_in) {

		u8 io_32bit = drive->io_32bit;

		stat = hwif->INB(IDE_STATUS_REG);

		if ((stat & DRQ_STAT) == 0)

			goto out;

		if (!OK_STAT(stat, DRQ_STAT, BAD_R_STAT)) {

			if (stat & (ERR_STAT | DRQ_STAT))

				return ide_error(drive, __FUNCTION__, stat);

			ide_set_handler(drive, &drive_cmd_intr, WAIT_WORSTCASE,

					NULL);

			return ide_started;

		}

		drive->io_32bit = 0;

		hwif->ata_input_data(drive, &args[4], args[3] * SECTOR_WORDS);

		drive->io_32bit = io_32bit;
@@ -653,7 +658,7 @@ static ide_startstop_t drive_cmd_intr (ide_drive_t *drive) 
		local_irq_enable_in_hardirq();

		stat = hwif->INB(IDE_STATUS_REG);

	}

out:



	if (!OK_STAT(stat, READY_STAT, BAD_STAT))

		return ide_error(drive, "drive_cmd", stat);

		/* calls ide_end_drive_cmd */