---

yaml --- r: 28888 b: refs/heads/master c: 1ad5544 h: refs/heads/master v: v3
git-mirror · Jun 23, 2006 · 34b1108 · 34b1108
1 parent fdaf316
commit 34b1108
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fa21d821f6972e70942f2c555ec29dde962bdb2
+refs/heads/master: 1ad5544098a69d7dc1fa508cbb17e13a7a952fd8
diff --git a/trunk/drivers/ide/ide-cd.c b/trunk/drivers/ide/ide-cd.c
@@ -1451,9 +1451,12 @@ static ide_startstop_t cdrom_pc_intr (ide_drive_t *drive)
 	} else {
 confused:
 		printk (KERN_ERR "%s: cdrom_pc_intr: The drive "
-			"appears confused (ireason = 0x%02x)\n",
+			"appears confused (ireason = 0x%02x). "
+			"Trying to recover by ending request.\n",
 			drive->name, ireason);
 		rq->flags |= REQ_FAILED;
+		cdrom_end_request(drive, 0);
+		return ide_stopped;
 	}
 
 	/* Now we wait for another interrupt. */