diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2007-09-26 08:20:44 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2007-09-26 08:20:44 +0200 |
| commit | ae3ba4fd966e38d8d766d19f7a58b551df8ecc97 (patch) | |
| tree | 8baa44d37bd837cea560b3fdd25476f9618e0f8e /drivers/cdrom | |
| parent | Linux 2.6.23-rc8 (diff) | |
| download | linux-ae3ba4fd966e38d8d766d19f7a58b551df8ecc97.tar.xz linux-ae3ba4fd966e38d8d766d19f7a58b551df8ecc97.zip | |
cdrom_open() forgets to unlock on -EROFS failure exits
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/cdrom')
| -rw-r--r-- | drivers/cdrom/cdrom.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index 67ee3d4b2878..79245714f0a7 100644 --- 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--; |