Re: [PATCH] Oops with eject and cdrom affects 2.4 & 2.5

From: Zwane Mwaikambo (zwane@linux.realnet.co.sz)
Date: Wed Jan 09 2002 - 04:07:33 EST


On Wed, 9 Jan 2002, Jens Axboe wrote:

> Yes, just kill the printk instead.

Here are patches for 2.5.2-pre10 and 2.4.18-pre2 respectively

--- linux-2.5.2-pre10/drivers/ide/ide-cd.c.orig Wed Jan 9 10:18:40 2002
+++ linux-2.5.2-pre10/drivers/ide/ide-cd.c Wed Jan 9 10:28:22 2002
@@ -1398,11 +1398,8 @@
                 ide_init_drive_cmd (&req);
                 req.flags = REQ_PC;
                 req.special = (char *) pc;
- if (ide_do_drive_cmd (drive, &req, ide_wait)) {
- printk("%s: do_drive_cmd returned stat=%02x,err=%02x\n",
- drive->name, req.buffer[0], req.buffer[1]);
- /* FIXME: we should probably abort/retry or something */
- }
+ ide_do_drive_cmd (drive, &req, ide_wait);
+
                 if (pc->stat != 0) {
                         /* The request failed. Retry if it was due to a unit
                            attention status

--- linux-2.4.18-pre2/drivers/ide/ide-cd.c.orig Wed Jan 9 11:04:47 2002
+++ linux-2.4.18-pre2/drivers/ide/ide-cd.c Wed Jan 9 11:05:14 2002
@@ -1462,11 +1462,8 @@
                 ide_init_drive_cmd (&req);
                 req.cmd = PACKET_COMMAND;
                 req.buffer = (char *)pc;
- if (ide_do_drive_cmd (drive, &req, ide_wait)) {
- printk("%s: do_drive_cmd returned stat=%02x,err=%02x\n",
- drive->name, req.buffer[0], req.buffer[1]);
- /* FIXME: we should probably abort/retry or something */
- }
+ ide_do_drive_cmd (drive, &req, ide_wait);
+
                 if (pc->stat != 0) {
                         /* The request failed. Retry if it was due to a unit
                            attention status

Cheers,
        Zwane Mwaikambo

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Tue Jan 15 2002 - 21:00:26 EST