---

yaml --- r: 137653 b: refs/heads/master c: c7016e9 h: refs/heads/master i: 137651: 3383f63 v: v3
git-mirror · Mar 27, 2009 · 5ff101d · 5ff101d
1 parent 39fa1af
commit 5ff101d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e295b8d27465a106cd3db150129ab539704e4c65
+refs/heads/master: c7016e95a556098db6dc4d9096a6189be9e18266
diff --git a/trunk/drivers/ide/ide-atapi.c b/trunk/drivers/ide/ide-atapi.c
@@ -336,11 +336,6 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
 	timeout = (drive->media == ide_floppy) ? WAIT_FLOPPY_CMD
 					       : WAIT_TAPE_CMD;
 
-	if (pc->flags & PC_FLAG_TIMEDOUT) {
-		drive->pc_callback(drive, 0);
-		return ide_stopped;
-	}
-
 	/* Clear the interrupt */
 	stat = tp_ops->read_status(hwif);
 

diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h
@@ -350,8 +350,6 @@ enum {
 	PC_FLAG_DMA_IN_PROGRESS		= (1 << 4),
 	PC_FLAG_DMA_ERROR		= (1 << 5),
 	PC_FLAG_WRITING			= (1 << 6),
-	/* command timed out */
-	PC_FLAG_TIMEDOUT		= (1 << 7),
 };
 
 /*