diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-05-19 15:26:57 -0400 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-05-19 15:26:57 -0400 |
| commit | 7e2987503dda95a5f80290bb8c06279009c2419e (patch) | |
| tree | e841944c911ada8d2b806e13d2c7b7320adaeb2f /drivers/char/raw.c | |
| parent | b1a45695bde0204597957e448923f09ce271ca80 (diff) | |
| parent | 49a43876b935c811cfd29d8fe998a6912a1cc5c4 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 131465e8de5a..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 blkdev_ioctl(bdev->bd_inode, filp, 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) |