lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* 'trivial' of git://git.kernel.dk/data/git/linux-2.6-block:
  cdrom_open() forgets to unlock on -EROFS failure exits
This commit is contained in:
Linus Torvalds
2007-09-26 08:58:13 -07:00
parent 4d3fac0871 ae3ba4fd96
commit 9a22e330e9
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/cdrom/cdrom.c
View File

@@ -1032,6 +1032,10 @@ int cdrom_open(struct cdrom_device_info *cdi, struct inode *ip, struct file *fp)
check_disk_change(ip->i_bdev); check_disk_change(ip->i_bdev);
return 0; return 0;
err_release: 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); cdi->ops->release(cdi);
err: err:
cdi->use_count--; cdi->use_count--;