Merge branch 'trivial' of git://git.kernel.dk/data/git/linux-2.6-block (9a22e330) · Commits · e / devices / android_kernel_teracube_2e

drivers/cdrom/cdrom.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -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--;