diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-13 08:16:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-13 08:16:40 +0100 |
| commit | 74239ac259519a98f4c32439326afe7e7eb64459 (patch) | |
| tree | a3e9a1ae0dc6634e7aa669c8881e425634094257 /drivers/video | |
| parent | efi/efivar_ssdt_load: Don't return success on allocation failure (diff) | |
| parent | Merge tag 'acpi-4.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/raf... (diff) | |
| download | linux-74239ac259519a98f4c32439326afe7e7eb64459.tar.xz linux-74239ac259519a98f4c32439326afe7e7eb64459.zip | |
Merge branch 'linus' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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; |