diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-10-09 14:11:30 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-10-09 14:11:30 +0200 |
| commit | 545633f6fecd240bfa50bb8e2db627eac76f9f8a (patch) | |
| tree | 7b68d3d5d49e352c5d1eaecd5e0958db89bda09a /sound/usb/usx2y/usb_stream.c | |
| parent | 3a9fce327ff9cabf7f89d3f20616a83af28393da (diff) | |
| parent | 5803b023881857db32ffefa0d269c90280a67ee0 (diff) | |
| download | op-kernel-dev-545633f6fecd240bfa50bb8e2db627eac76f9f8a.zip op-kernel-dev-545633f6fecd240bfa50bb8e2db627eac76f9f8a.tar.gz | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/usb/usx2y/usb_stream.c')
| -rw-r--r-- | sound/usb/usx2y/usb_stream.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/usb/usx2y/usb_stream.c b/sound/usb/usx2y/usb_stream.c index 4dab490..e229abd 100644 --- a/sound/usb/usx2y/usb_stream.c +++ b/sound/usb/usx2y/usb_stream.c @@ -191,7 +191,8 @@ struct usb_stream *usb_stream_new(struct usb_stream_kernel *sk, } pg = get_order(read_size); - sk->s = (void *) __get_free_pages(GFP_KERNEL|__GFP_COMP|__GFP_ZERO, pg); + sk->s = (void *) __get_free_pages(GFP_KERNEL|__GFP_COMP|__GFP_ZERO| + __GFP_NOWARN, pg); if (!sk->s) { snd_printk(KERN_WARNING "couldn't __get_free_pages()\n"); goto out; @@ -211,7 +212,8 @@ struct usb_stream *usb_stream_new(struct usb_stream_kernel *sk, pg = get_order(write_size); sk->write_page = - (void *)__get_free_pages(GFP_KERNEL|__GFP_COMP|__GFP_ZERO, pg); + (void *)__get_free_pages(GFP_KERNEL|__GFP_COMP|__GFP_ZERO| + __GFP_NOWARN, pg); if (!sk->write_page) { snd_printk(KERN_WARNING "couldn't __get_free_pages()\n"); usb_stream_free(sk); |
