From 3ec4a14aa487cd89ec4acebdcf2c4df60e240e65 Mon Sep 17 00:00:00 2001 From: Peter Osterlund Date: Tue, 14 Feb 2006 13:52:56 -0800 Subject: [PATCH] --- yaml --- r: 20311 b: refs/heads/master c: 948423e5ccc33bc257384ad4b339214c577bc926 h: refs/heads/master i: 20309: ec5e77b0650e27c26f8e46a3d67ce42cb5f770d2 20307: 84072d6f2bcbb25ef77b916bb7f12ebab558e5c3 20303: 7b8c05b15ed6c6a8467cb5453256f2b332e9d82a v: v3 --- [refs] | 2 +- trunk/drivers/block/pktcdvd.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index abcf9aa4a8b3..a11408adadb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01fd9fda2ce462b44bafdac2fe6aacacf23531f2 +refs/heads/master: 948423e5ccc33bc257384ad4b339214c577bc926 diff --git a/trunk/drivers/block/pktcdvd.c b/trunk/drivers/block/pktcdvd.c index edf6bf29002e..89d8fe014efa 100644 --- a/trunk/drivers/block/pktcdvd.c +++ b/trunk/drivers/block/pktcdvd.c @@ -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: