diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-11-11 19:29:34 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-11-12 02:53:30 -0500 |
| commit | 51b44eb17b8ec6c83eac7772b4c8bc5887c5fbf7 (patch) | |
| tree | 4125e1888cbc215ec4a365457505a407f48e5232 /drivers/char | |
| parent | cc7096fb6d1dfbdac5e7e2675c046fd40646cc66 (diff) | |
| parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff) | |
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.c | 2 |
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, | |||
| 285 | 285 | ||
| 286 | static const struct file_operations raw_fops = { | 286 | static const struct file_operations raw_fops = { |
| 287 | .read = new_sync_read, | 287 | .read = new_sync_read, |
| 288 | .read_iter = generic_file_read_iter, | 288 | .read_iter = blkdev_read_iter, |
| 289 | .write = new_sync_write, | 289 | .write = new_sync_write, |
| 290 | .write_iter = blkdev_write_iter, | 290 | .write_iter = blkdev_write_iter, |
| 291 | .fsync = blkdev_fsync, | 291 | .fsync = blkdev_fsync, |