aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ide/ide-atapi.c3
-rw-r--r--include/linux/ide.h1
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index 711a5f6d35e4..adf04f99cdeb 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -302,8 +302,7 @@ ide_startstop_t ide_issue_pc(ide_drive_t *drive, struct ide_atapi_pc *pc,
302 bcount, dma); 302 bcount, dma);
303 303
304 /* Issue the packet command */ 304 /* Issue the packet command */
305 if ((pc->flags & PC_FLAG_DRQ_INTERRUPT) || 305 if (drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT) {
306 (drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT)) {
307 ide_execute_command(drive, WIN_PACKETCMD, handler, 306 ide_execute_command(drive, WIN_PACKETCMD, handler,
308 timeout, NULL); 307 timeout, NULL);
309 return ide_started; 308 return ide_started;
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 147bfee1fe70..d67ccca2b964 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -687,7 +687,6 @@ enum {
687 PC_FLAG_WRITING = (1 << 6), 687 PC_FLAG_WRITING = (1 << 6),
688 /* command timed out */ 688 /* command timed out */
689 PC_FLAG_TIMEDOUT = (1 << 7), 689 PC_FLAG_TIMEDOUT = (1 << 7),
690 PC_FLAG_DRQ_INTERRUPT = (1 << 8),
691}; 690};
692 691
693struct ide_atapi_pc { 692struct ide_atapi_pc {