diff options
| author |   Borislav Petkov <petkovbb@googlemail.com> | 2009-01-02 16:12:53 +0100 |
|---|---|---|
| committer |   Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-01-02 16:12:53 +0100 |
| commit | 5f25843fa79b7c35097b0ffe8b2c5cc2428d6495 (patch) | |
| tree | 6d3c445e97390645c85a678542d5fc16a46b50ce /drivers/ide | |
| parent | ide-atapi: accomodate transfer length calculation for ide-cd (diff) | |
| download | linux-dev-5f25843fa79b7c35097b0ffe8b2c5cc2428d6495.tar.xz linux-dev-5f25843fa79b7c35097b0ffe8b2c5cc2428d6495.zip | |
ide-atapi: teach ide atapi about drive->waiting_for_dma
In addition, we wait for DRQ to be asserted by repeatedly polling
device status no matter what DRQ type each device implements.
Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/ide-atapi.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c index 8884877bd2b5..8c5cf68fbd79 100644 --- a/drivers/ide/ide-atapi.c +++ b/drivers/ide/ide-atapi.c @@ -511,6 +511,11 @@ static ide_startstop_t ide_transfer_pc(ide_drive_t *drive) return startstop; } + if (drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT) { + if (drive->dma) + drive->waiting_for_dma = 1; + } + ireason = ide_read_ireason(drive); if (drive->media == ide_tape && (drive->dev_flags & IDE_DFLAG_SCSI) == 0) @@ -605,6 +610,8 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, unsigned int timeout, /* Issue the packet command */ if (drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT) { + if (drive->dma) + drive->waiting_for_dma = 0; ide_execute_command(drive, ATA_CMD_PACKET, ide_transfer_pc, timeout, NULL); return ide_started; |