From dfe6497ea78db1d59160a792fe1779c669f6d9cd Mon Sep 17 00:00:00 2001 From: Peter Osterlund Date: Sat, 14 May 2005 00:58:30 -0700 Subject: [PATCH] --- yaml --- r: 1120 b: refs/heads/master c: 118326e940bdecef6c459d42ccf05256ba86daa7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/pktcdvd.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6fbfda2ac30a..509818289ea1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68f66feb300423bb9ee5daecb1951af394425a38 +refs/heads/master: 118326e940bdecef6c459d42ccf05256ba86daa7 diff --git a/trunk/drivers/block/pktcdvd.c b/trunk/drivers/block/pktcdvd.c index 1a1fa3ccb913..82ccad0a7f1a 100644 --- a/trunk/drivers/block/pktcdvd.c +++ b/trunk/drivers/block/pktcdvd.c @@ -2406,7 +2406,7 @@ static int pkt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u case CDROM_LAST_WRITTEN: case CDROM_SEND_PACKET: case SCSI_IOCTL_SEND_COMMAND: - return ioctl_by_bdev(pd->bdev, cmd, arg); + return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg); case CDROMEJECT: /* @@ -2414,7 +2414,7 @@ static int pkt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u * have to unlock it or else the eject command fails. */ pkt_lock_door(pd, 0); - return ioctl_by_bdev(pd->bdev, cmd, arg); + return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg); default: printk("pktcdvd: Unknown ioctl for %s (%x)\n", pd->name, cmd);