ide-floppy: convert to using the new atapi_flags (take 2)

[linux-2.6-omap-h63xx.git] / drivers / ide / ide-atapi.c

diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index f848010c15a5ec275b3cb7026ce6b100c807a5d0..711a5f6d35e43c3285f2e8a96b2793330ac00b71 100644 (file)
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -257,7 +257,7 @@ ide_startstop_t ide_transfer_pc(ide_drive_t *drive, struct ide_atapi_pc *pc,
        }
 
        /* Send the actual packet */
-       if ((pc->flags & PC_FLAG_ZIP_DRIVE) == 0)
+       if ((drive->atapi_flags & IDE_AFLAG_ZIP_DRIVE) == 0)
                hwif->tp_ops->output_data(drive, NULL, rq->cmd, 12);
 
        return ide_started;
@@ -302,7 +302,8 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, struct ide_atapi_pc *pc,
                           bcount, dma);
 
        /* Issue the packet command */
-       if (pc->flags & PC_FLAG_DRQ_INTERRUPT) {
+       if ((pc->flags & PC_FLAG_DRQ_INTERRUPT) ||
+           (drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT)) {
                ide_execute_command(drive, WIN_PACKETCMD, handler,
                                    timeout, NULL);
                return ide_started;