ide-atapi: start dma in a drive-specific way
There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov <petkovbb@gmail.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Родитель
06cc2778a1
Коммит
b16aabc937
|
@ -489,7 +489,7 @@ static int ide_delayed_transfer_pc(ide_drive_t *drive)
|
||||||
|
|
||||||
static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)
|
static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)
|
||||||
{
|
{
|
||||||
struct ide_atapi_pc *pc = drive->pc;
|
struct ide_atapi_pc *uninitialized_var(pc);
|
||||||
ide_hwif_t *hwif = drive->hwif;
|
ide_hwif_t *hwif = drive->hwif;
|
||||||
struct request *rq = hwif->hwgroup->rq;
|
struct request *rq = hwif->hwgroup->rq;
|
||||||
ide_expiry_t *expiry;
|
ide_expiry_t *expiry;
|
||||||
|
@ -518,6 +518,8 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)
|
||||||
timeout = rq->timeout;
|
timeout = rq->timeout;
|
||||||
expiry = ide_cd_expiry;
|
expiry = ide_cd_expiry;
|
||||||
} else {
|
} else {
|
||||||
|
pc = drive->pc;
|
||||||
|
|
||||||
cmd_len = ATAPI_MIN_CDB_BYTES;
|
cmd_len = ATAPI_MIN_CDB_BYTES;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -550,9 +552,14 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive)
|
||||||
ide_set_handler(drive, ide_pc_intr, timeout, expiry);
|
ide_set_handler(drive, ide_pc_intr, timeout, expiry);
|
||||||
|
|
||||||
/* Begin DMA, if necessary */
|
/* Begin DMA, if necessary */
|
||||||
if (pc->flags & PC_FLAG_DMA_OK) {
|
if (dev_is_idecd(drive)) {
|
||||||
pc->flags |= PC_FLAG_DMA_IN_PROGRESS;
|
if (drive->dma)
|
||||||
hwif->dma_ops->dma_start(drive);
|
hwif->dma_ops->dma_start(drive);
|
||||||
|
} else {
|
||||||
|
if (pc->flags & PC_FLAG_DMA_OK) {
|
||||||
|
pc->flags |= PC_FLAG_DMA_IN_PROGRESS;
|
||||||
|
hwif->dma_ops->dma_start(drive);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Send the actual packet */
|
/* Send the actual packet */
|
||||||
|
|
Загрузка…
Ссылка в новой задаче