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

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

ide-atapi: start DMA after issuing a packet command 

Apparently¹, some ATAPI devices want to see the packet command first
before enabling DMA otherwise they simply hang indefinitely. Reorder the
two steps and start DMA only after having issued the command first.

[1] http://marc.info/?l=linux-kernel&m=123835520317235&w=2



Signed-off-by: default avatarBorislav Petkov <petkovbb@gmail.com>
Reported-by: default avatarMichael Roth <mroth@nessie.de>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent da19620d

drivers/ide/ide-atapi.c

+4 −4
Original line number Diff line number Diff line
@@ -613,6 +613,10 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive) 
					     : ide_pc_intr),

			timeout);



	/* Send the actual packet */

	if ((drive->atapi_flags & IDE_AFLAG_ZIP_DRIVE) == 0)

		hwif->tp_ops->output_data(drive, NULL, rq->cmd, cmd_len);



	/* Begin DMA, if necessary */

	if (dev_is_idecd(drive)) {

		if (drive->dma)
@@ -624,10 +628,6 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive) 
		}

	}



	/* Send the actual packet */

	if ((drive->atapi_flags & IDE_AFLAG_ZIP_DRIVE) == 0)

		hwif->tp_ops->output_data(drive, NULL, rq->cmd, cmd_len);



	return ide_started;

}