From 5de432f98cea1f89f8135adb8f1a530267304893 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 27 Jul 2012 01:46:51 +0000 Subject: [PATCH] --- yaml --- r: 319122 b: refs/heads/master c: e4c7f259c5be99dcfc3d98f913590663b0305bf8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/usb/kaweth.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a4690c16fd1a..fe0d0064a5d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42493570100b91ef663c4c6f0c0fdab238f9d3c2 +refs/heads/master: e4c7f259c5be99dcfc3d98f913590663b0305bf8 diff --git a/trunk/drivers/net/usb/kaweth.c b/trunk/drivers/net/usb/kaweth.c index d8ad55284389..c3d03490c97d 100644 --- a/trunk/drivers/net/usb/kaweth.c +++ b/trunk/drivers/net/usb/kaweth.c @@ -1314,7 +1314,7 @@ static int kaweth_internal_control_msg(struct usb_device *usb_dev, int retv; int length = 0; /* shut up GCC */ - urb = usb_alloc_urb(0, GFP_NOIO); + urb = usb_alloc_urb(0, GFP_ATOMIC); if (!urb) return -ENOMEM;