patch-2.1.14 linux/drivers/cdrom/cdrom.c

Next file: linux/drivers/char/cyclades.c
Previous file: linux/drivers/block/loop.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.13/linux/drivers/cdrom/cdrom.c linux/drivers/cdrom/cdrom.c
@@ -350,9 +350,11 @@
                 
         case CDROMEJECT:
                 if (cdo->capability & ~cdi->mask & CDC_OPEN_TRAY) {
-			if (cdi->use_count == 1)
+			if (cdi->use_count == 1) {
+			        if (cdo->capability & ~cdi->mask & CDC_LOCK)
+					cdo->lock_door(cdi, 0);
 				return cdo->tray_move(cdi, 1);
-			else
+			} else
 				return -EBUSY;
 		} else
                         return -EINVAL;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov