diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-26 08:58:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-26 08:58:13 -0700 |
| commit | 9a22e330e9cbab8deab2db913a0d37bb99140ecb (patch) | |
| tree | da94fdd4e28ca0ac0548f54fdc00a077eca18d7f /drivers | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
| parent | cdrom_open() forgets to unlock on -EROFS failure exits (diff) | |
| download | linux-dev-9a22e330e9cbab8deab2db913a0d37bb99140ecb.tar.xz linux-dev-9a22e330e9cbab8deab2db913a0d37bb99140ecb.zip | |
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
Diffstat (limited to 'drivers')
| -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--; |