Commit 06cc2778 authored by Borislav Petkov's avatar Borislav Petkov Committed by Bartlomiej Zolnierkiewicz
Browse files

ide-atapi: put the rest of non-ide-cd code into the else-clause of ide_transfer_pc 



There should be no functionality change resulting from this patch.

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

drivers/ide/ide-atapi.c

+11 −11
Original line number Diff line number Diff line
@@ -509,17 +509,6 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive) 
			drive->waiting_for_dma = 1;

	}



	ireason = ide_read_ireason(drive);

	if (drive->media == ide_tape)

		ireason = ide_wait_ireason(drive, ireason);



	if ((ireason & ATAPI_COD) == 0 || (ireason & ATAPI_IO)) {

		printk(KERN_ERR "%s: (IO,CoD) != (0,1) while issuing "

				"a packet command\n", drive->name);



		return ide_do_reset(drive);

	}



	if (dev_is_idecd(drive)) {

		/* ATAPI commands get padded out to 12 bytes minimum */

		cmd_len = COMMAND_SIZE(rq->cmd[0]);
@@ -544,6 +533,17 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive) 
							       : WAIT_TAPE_CMD;

			expiry = NULL;

		}



		ireason = ide_read_ireason(drive);

		if (drive->media == ide_tape)

			ireason = ide_wait_ireason(drive, ireason);



		if ((ireason & ATAPI_COD) == 0 || (ireason & ATAPI_IO)) {

			printk(KERN_ERR "%s: (IO,CoD) != (0,1) while issuing "

					"a packet command\n", drive->name);



			return ide_do_reset(drive);

		}

	}



	/* Set the interrupt routine */