diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-07-26 21:46:51 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-27 16:45:50 -0400 |
commit | e4c7f259c5be99dcfc3d98f913590663b0305bf8 (patch) | |
tree | fb80f3f5ef84c062b118231c4fd591fc0e8965df | |
parent | 42493570100b91ef663c4c6f0c0fdab238f9d3c2 (diff) |
USB: kaweth.c: use GFP_ATOMIC under spin_lock
The problem is that we call this with a spin lock held. The call tree
is:
kaweth_start_xmit() holds kaweth->device_lock.
-> kaweth_async_set_rx_mode()
-> kaweth_control()
-> kaweth_internal_control_msg()
The kaweth_internal_control_msg() function is only called from
kaweth_control() which used GFP_ATOMIC for its allocations.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/usb/kaweth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c index d8ad55284389..c3d03490c97d 100644 --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c | |||
@@ -1314,7 +1314,7 @@ static int kaweth_internal_control_msg(struct usb_device *usb_dev, | |||
1314 | int retv; | 1314 | int retv; |
1315 | int length = 0; /* shut up GCC */ | 1315 | int length = 0; /* shut up GCC */ |
1316 | 1316 | ||
1317 | urb = usb_alloc_urb(0, GFP_NOIO); | 1317 | urb = usb_alloc_urb(0, GFP_ATOMIC); |
1318 | if (!urb) | 1318 | if (!urb) |
1319 | return -ENOMEM; | 1319 | return -ENOMEM; |
1320 | 1320 | ||