Automatic merge of /spare/repo/netdev-2.6 branch skge

[linux-2.6] / drivers / char / raw.c

diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index 131465e8de5aa72b6e8f5621a6b000c97862f73a..ca5f42bcaad91eeca08a3984cf530ab2f7b5818c 100644 (file)
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -122,7 +122,7 @@ raw_ioctl(struct inode *inode, struct file *filp,
 {
        struct block_device *bdev = filp->private_data;
 
-       return blkdev_ioctl(bdev->bd_inode, filp, command, arg);
+       return blkdev_ioctl(bdev->bd_inode, NULL, command, arg);
 }
 
 static void bind_device(struct raw_config_request *rq)