Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 1120
b: refs/heads/master
c: 118326e
h: refs/heads/master
v: v3
  • Loading branch information
Peter Osterlund authored and Greg KH committed May 17, 2005
1 parent 480561a commit dfe6497
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 68f66feb300423bb9ee5daecb1951af394425a38
refs/heads/master: 118326e940bdecef6c459d42ccf05256ba86daa7
4 changes: 2 additions & 2 deletions trunk/drivers/block/pktcdvd.c
Original file line number Diff line number Diff line change
Expand Up @@ -2406,15 +2406,15 @@ 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:
/*
* 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);
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);
Expand Down

0 comments on commit dfe6497

Please sign in to comment.