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

• Lines: 19
• Date: Tue Jan 4 10:12:14 2000
• Orig file: v2.2.13/linux/drivers/cdrom/cdrom.c
• Orig date: Tue Jan 4 11:10:33 2000

diff -u --recursive --new-file v2.2.13/linux/drivers/cdrom/cdrom.c linux/drivers/cdrom/cdrom.c
@@ -842,12 +842,13 @@
 
 	case CDROM_LOCKDOOR: {
 		cdinfo(CD_DO_IOCTL, "%socking door.\n",arg?"L":"Unl");
-		if (!CDROM_CAN(CDC_LOCK)) {
+		if (!CDROM_CAN(CDC_LOCK))
 			return -EDRIVE_CANT_DO_THIS;
-		} else {
-			keeplocked = arg ? 1 : 0;
-			return cdo->lock_door(cdi, arg);
-		}
+		keeplocked = arg ? 1 : 0;
+		/* don't unlock the door on multiple opens */
+		if ((cdi->use_count != 1) && !arg)
+			return -EBUSY;
+		return cdo->lock_door(cdi, arg);
 		}
 
 	case CDROM_DEBUG: {