summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2014-11-12 10:29:34 +1000
committerDave Airlie <airlied@redhat.com>2014-11-12 17:53:30 +1000
commit51b44eb17b8ec6c83eac7772b4c8bc5887c5fbf7 (patch)
tree4125e1888cbc215ec4a365457505a407f48e5232 /drivers/char
parentcc7096fb6d1dfbdac5e7e2675c046fd40646cc66 (diff)
parent206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff)
downloadlinux-51b44eb17b8ec6c83eac7772b4c8bc5887c5fbf7.tar.bz2
Merge tag 'v3.18-rc4' into drm-next
backmerge to get vmwgfx locking changes into next as the conflict with per-plane locking.
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/raw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index 0102dc788608..a24891b97547 100644
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -285,7 +285,7 @@ static long raw_ctl_compat_ioctl(struct file *file, unsigned int cmd,
static const struct file_operations raw_fops = {
.read = new_sync_read,
- .read_iter = generic_file_read_iter,
+ .read_iter = blkdev_read_iter,
.write = new_sync_write,
.write_iter = blkdev_write_iter,
.fsync = blkdev_fsync,