diff options
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/gadget/function/f_phonet.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/function/f_phonet.c b/drivers/usb/gadget/function/f_phonet.c index 1ec8b7ffdccd..c89e96cfa3e4 100644 --- a/drivers/usb/gadget/function/f_phonet.c +++ b/drivers/usb/gadget/function/f_phonet.c | |||
@@ -303,7 +303,7 @@ pn_rx_submit(struct f_phonet *fp, struct usb_request *req, gfp_t gfp_flags) | |||
303 | struct page *page; | 303 | struct page *page; |
304 | int err; | 304 | int err; |
305 | 305 | ||
306 | page = __skb_alloc_page(gfp_flags | __GFP_NOMEMALLOC, NULL); | 306 | page = __dev_alloc_page(gfp_flags | __GFP_NOMEMALLOC); |
307 | if (!page) | 307 | if (!page) |
308 | return -ENOMEM; | 308 | return -ENOMEM; |
309 | 309 | ||
@@ -377,7 +377,7 @@ static void pn_rx_complete(struct usb_ep *ep, struct usb_request *req) | |||
377 | if (page) | 377 | if (page) |
378 | put_page(page); | 378 | put_page(page); |
379 | if (req) | 379 | if (req) |
380 | pn_rx_submit(fp, req, GFP_ATOMIC | __GFP_COLD); | 380 | pn_rx_submit(fp, req, GFP_ATOMIC); |
381 | } | 381 | } |
382 | 382 | ||
383 | /*-------------------------------------------------------------------------*/ | 383 | /*-------------------------------------------------------------------------*/ |
@@ -437,7 +437,7 @@ static int pn_set_alt(struct usb_function *f, unsigned intf, unsigned alt) | |||
437 | 437 | ||
438 | netif_carrier_on(dev); | 438 | netif_carrier_on(dev); |
439 | for (i = 0; i < phonet_rxq_size; i++) | 439 | for (i = 0; i < phonet_rxq_size; i++) |
440 | pn_rx_submit(fp, fp->out_reqv[i], GFP_ATOMIC | __GFP_COLD); | 440 | pn_rx_submit(fp, fp->out_reqv[i], GFP_ATOMIC); |
441 | } | 441 | } |
442 | spin_unlock(&port->lock); | 442 | spin_unlock(&port->lock); |
443 | return 0; | 443 | return 0; |