diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-07-27 03:46:51 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-27 22:45:50 +0200 |
| commit | e4c7f259c5be99dcfc3d98f913590663b0305bf8 (patch) | |
| tree | fb80f3f5ef84c062b118231c4fd591fc0e8965df /drivers/net/usb/kaweth.c | |
| parent | tcp: Add TCP_USER_TIMEOUT negative value check (diff) | |
| download | linux-e4c7f259c5be99dcfc3d98f913590663b0305bf8.tar.xz linux-e4c7f259c5be99dcfc3d98f913590663b0305bf8.zip | |
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>
Diffstat (limited to 'drivers/net/usb/kaweth.c')
| -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, 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; |