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

ide-atapi: assign taskfile flags per device type 



There should be no functional change resulting from this patch.

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

drivers/ide/ide-atapi.c

+9 −2
Original line number Diff line number Diff line
@@ -544,6 +544,7 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, unsigned int timeout, 
{

	struct ide_atapi_pc *pc = drive->pc;

	ide_hwif_t *hwif = drive->hwif;

	u32 tf_flags;

	u16 bcount;

	u8 scsi = !!(drive->dev_flags & IDE_DFLAG_SCSI);
@@ -574,8 +575,14 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, unsigned int timeout, 
	if (!drive->dma)

		pc->flags &= ~PC_FLAG_DMA_OK;



	ide_pktcmd_tf_load(drive, scsi ? 0 : IDE_TFLAG_OUT_DEVICE, bcount,

			   drive->dma);

	if (scsi)

		tf_flags = 0;

	else if (drive->media == ide_cdrom || drive->media == ide_optical)

		tf_flags = IDE_TFLAG_OUT_NSECT | IDE_TFLAG_OUT_LBAL;

	else

		tf_flags = IDE_TFLAG_OUT_DEVICE;



	ide_pktcmd_tf_load(drive, tf_flags, bcount, drive->dma);



	/* Issue the packet command */

	if (drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT) {