Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[firefly-linux-kernel-4.4.55.git] / sound / oss / msnd_pinnacle.c

diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c
index 6ba03f89fc4364a50f94bae294eb3aada785bcd5..0c2db657badd135a66a83b3b5ce142ac84d01435 100644 (file)
--- a/sound/oss/msnd_pinnacle.c
+++ b/sound/oss/msnd_pinnacle.c
@@ -892,7 +892,7 @@ static __inline__ int pack_DAPF_to_DAPQ(register int start)
 static int dsp_read(char __user *buf, size_t len)
 {
        int count = len;
-       char *page = (char *)__get_free_page(PAGE_SIZE);
+       char *page = (char *)__get_free_page(GFP_KERNEL);
 
        if (!page)
                return -ENOMEM;