diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-06-03 23:54:56 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-03 23:54:56 -0400 |
| commit | 73561695b2e77473e353a5ae63bab81ed5098d8e (patch) | |
| tree | d039affaa54d38985e41566e4d62e0aa6a170287 /drivers/char/raw.c | |
| parent | 6f2f38128170814e151cfedf79532e19cd179567 (diff) | |
| parent | 8be3de3fd8469154a2b3e18a4712032dac5b4a53 (diff) | |
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
Diffstat (limited to 'drivers/char/raw.c')
| -rw-r--r-- | drivers/char/raw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/raw.c b/drivers/char/raw.c index a2e33ec79615..ca5f42bcaad9 100644 --- a/drivers/char/raw.c +++ b/drivers/char/raw.c | |||
| @@ -122,7 +122,7 @@ raw_ioctl(struct inode *inode, struct file *filp, | |||
| 122 | { | 122 | { |
| 123 | struct block_device *bdev = filp->private_data; | 123 | struct block_device *bdev = filp->private_data; |
| 124 | 124 | ||
| 125 | return ioctl_by_bdev(bdev, command, arg); | 125 | return blkdev_ioctl(bdev->bd_inode, NULL, command, arg); |
| 126 | } | 126 | } |
| 127 | 127 | ||
| 128 | static void bind_device(struct raw_config_request *rq) | 128 | static void bind_device(struct raw_config_request *rq) |