From 34b11088bfc9dab31a8902195117d1dd930383ac Mon Sep 17 00:00:00 2001 From: Rachita Kothiyal Date: Fri, 23 Jun 2006 02:02:56 -0700 Subject: [PATCH] --- yaml --- r: 28888 b: refs/heads/master c: 1ad5544098a69d7dc1fa508cbb17e13a7a952fd8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-cd.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 16536c2437ca..2e095d04dfe2 100644 --- 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 index b4a41d6d0714..abb83d95df57 100644 --- 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. */