Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 20311
b: refs/heads/master
c: 948423e
h: refs/heads/master
i:
  20309: ec5e77b
  20307: 84072d6
  20303: 7b8c05b
v: v3
  • Loading branch information
Peter Osterlund authored and Linus Torvalds committed Feb 15, 2006
1 parent 979b51d commit 3ec4a14
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 01fd9fda2ce462b44bafdac2fe6aacacf23531f2
refs/heads/master: 948423e5ccc33bc257384ad4b339214c577bc926
3 changes: 2 additions & 1 deletion trunk/drivers/block/pktcdvd.c
Original file line number Diff line number Diff line change
Expand Up @@ -2435,7 +2435,8 @@ static int pkt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u
* The door gets locked when the device is opened, so we
* have to unlock it or else the eject command fails.
*/
pkt_lock_door(pd, 0);
if (pd->refcnt == 1)
pkt_lock_door(pd, 0);
return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);

default:
Expand Down

0 comments on commit 3ec4a14

Please sign in to comment.