diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2016-11-19 00:13:41 +0100 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2016-11-19 00:13:41 +0100 |
| commit | 917fef6f7ee8b2fe852692ac49771342bfef9433 (patch) | |
| tree | b5932aab90d449841803b6f8679a4564ca2a6eaf /drivers/video | |
| parent | kernel-doc: add support for one line inline struct member doc comments (diff) | |
| parent | Linux 4.9-rc4 (diff) | |
| download | linux-917fef6f7ee8b2fe852692ac49771342bfef9433.tar.xz linux-917fef6f7ee8b2fe852692ac49771342bfef9433.zip | |
Merge tag 'v4.9-rc4' into sound
Bring in -rc4 patches so I can successfully merge the sound doc changes.
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbdev/pvr2fb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/pvr2fb.c b/drivers/video/fbdev/pvr2fb.c index 3b1ca4411073..a2564ab91e62 100644 --- a/drivers/video/fbdev/pvr2fb.c +++ b/drivers/video/fbdev/pvr2fb.c @@ -686,8 +686,8 @@ static ssize_t pvr2fb_write(struct fb_info *info, const char *buf, if (!pages) return -ENOMEM; - ret = get_user_pages_unlocked((unsigned long)buf, nr_pages, WRITE, - 0, pages); + ret = get_user_pages_unlocked((unsigned long)buf, nr_pages, pages, + FOLL_WRITE); if (ret < nr_pages) { nr_pages = ret; |