--- linux-2.4.4-orig/drivers/cdrom/cdrom.c	Tue May  1 14:32:05 2001
+++ linux-2.4.4/drivers/cdrom/cdrom.c	Sun Jun 10 15:32:48 2001
@@ -515,8 +515,8 @@ int open_for_data(struct cdrom_device_in
 	if (cdo->drive_status != NULL) {
 		ret = cdo->drive_status(cdi, CDSL_CURRENT);
 		cdinfo(CD_OPEN, "drive_status=%d\n", ret); 
-		if (ret == CDS_TRAY_OPEN) {
-			cdinfo(CD_OPEN, "the tray is open...\n"); 
+		if (ret == CDS_TRAY_OPEN || ret == CDS_NO_DISC) {
+			cdinfo(CD_OPEN, "the tray might be open...\n"); 
 			/* can/may i close it? */
 			if (CDROM_CAN(CDC_CLOSE_TRAY) &&
 			    cdi->options & CDO_AUTO_CLOSE) {
@@ -622,7 +622,7 @@ int check_for_audio_disc(struct cdrom_de
 	if (cdo->drive_status != NULL) {
 		ret = cdo->drive_status(cdi, CDSL_CURRENT);
 		cdinfo(CD_OPEN, "drive_status=%d\n", ret); 
-		if (ret == CDS_TRAY_OPEN) {
+		if (ret == CDS_TRAY_OPEN || ret == CDS_NO_DISC) {
 			cdinfo(CD_OPEN, "the tray is open...\n"); 
 			/* can/may i close it? */
 			if (CDROM_CAN(CDC_CLOSE_TRAY) &&