projects/linux·commit 9a22e330

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

9a22e330 · Linus Torvalds <[email protected]> · 2007-09-26 08:58:13 -07:00

* 'trivial' of git://git.kernel.dk/data/git/linux-2.6-block:
  cdrom_open() forgets to unlock on -EROFS failure exits
Commit
9a22e330e9cbab8deab2db913a0d37bb99140ecb
Parents
4d3fac08 · ae3ba4fd

Merge commit. Changes below are compared with the first parent: 4d3fac08.

Changes

1 files changed · +4 −0

FileStatusAddDelContent
drivers/cdrom/cdrom.cmodified+4−0View file

drivers/cdrom/cdrom.c

View file
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 67ee3d4..7924571 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--;