Merge branch 'trivial' of git://git.kernel.dk/data/git/linux-2.6-block

* 'trivial' of git://git.kernel.dk/data/git/linux-2.6-block: cdrom_open() forgets to unlock on -EROFS failure exits
mariux64 · Sep 26, 2007 · 9a22e33 · 9a22e33
2 parents 4d3fac0 + ae3ba4f
commit 9a22e33
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
@@ -1032,6 +1032,10 @@ int cdrom_open(struct cdrom_device_info *cdi, struct inode *ip, struct file *fp)
 	check_disk_change(ip->i_bdev);
 	return 0;
 err_release:
+	if (CDROM_CAN(CDC_LOCK) && cdi->options & CDO_LOCK) {
+		cdi->ops->lock_door(cdi, 0);
+		cdinfo(CD_OPEN, "door unlocked.\n");
+	}
 	cdi->ops->release(cdi);
 err:
 	cdi->use_count--;