This is the only user I'll feed you this time. As with 2.4 I want it to
run for a bit on read only media first 8)
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.61/drivers/ide/ide-cd.c linux-2.5.61-ac2/drivers/ide/ide-cd.c
--- linux-2.5.61/drivers/ide/ide-cd.c 2003-02-10 18:38:30.000000000 +0000
+++ linux-2.5.61-ac2/drivers/ide/ide-cd.c 2003-02-18 18:06:17.000000000 +0000
@@ -854,13 +855,10 @@
HWIF(drive)->OUTB(xferlen >> 8 , IDE_BCOUNTH_REG);
if (IDE_CONTROL_REG)
HWIF(drive)->OUTB(drive->ctl, IDE_CONTROL_REG);
-
+
if (CDROM_CONFIG_FLAGS (drive)->drq_interrupt) {
- if (HWGROUP(drive)->handler != NULL)
- BUG();
- ide_set_handler (drive, handler, WAIT_CMD, cdrom_timer_expiry);
/* packet command */
- HWIF(drive)->OUTB(WIN_PACKETCMD, IDE_COMMAND_REG);
+ ide_execute_command(drive, WIN_PACKETCMD, handler, WAIT_CMD, cdrom_timer_expiry);
return ide_started;
} else {
/* packet command */
-
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 : Sun Feb 23 2003 - 22:00:22 EST