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

Commit 5fe31104 authored by Borislav Petkov's avatar Borislav Petkov Committed by Bartlomiej Zolnierkiewicz
Browse files

ide-atapi: remove ide-scsi remnants from ide_transfer_pc() 



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

drivers/ide/ide-atapi.c

+4 −10
Original line number Diff line number Diff line
@@ -550,8 +550,7 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive) 
	}



	ireason = ide_read_ireason(drive);

	if (drive->media == ide_tape &&

	    (drive->dev_flags & IDE_DFLAG_SCSI) == 0)

	if (drive->media == ide_tape)

		ireason = ide_wait_ireason(drive, ireason);



	if ((ireason & ATAPI_COD) == 0 || (ireason & ATAPI_IO)) {
@@ -568,16 +567,11 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive) 
	if (drive->atapi_flags & IDE_AFLAG_ZIP_DRIVE) {

		timeout = drive->pc_delay;

		expiry = &ide_delayed_transfer_pc;

	} else {

		if (drive->dev_flags & IDE_DFLAG_SCSI) {

			timeout = ide_scsi_get_timeout(pc);

			expiry = ide_scsi_expiry;

	} else {

		timeout = (drive->media == ide_floppy) ? WAIT_FLOPPY_CMD

						       : WAIT_TAPE_CMD;

		expiry = NULL;

	}

	}



	/* Set the interrupt routine */

	ide_set_handler(drive, ide_pc_intr, timeout, expiry);