aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-07-26 21:46:51 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-09 11:27:52 -0400
commit242e0e14c3995231230b2836bcd1f5dc6c08ff90 (patch)
tree38e4eaede4d20a033455352f4febd73955516691
parent8d7c99de6821880884e6f9ade1c6f269d40ebbae (diff)
USB: kaweth.c: use GFP_ATOMIC under spin_lock
[ Upstream commit e4c7f259c5be99dcfc3d98f913590663b0305bf8 ] 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/usb/kaweth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/kaweth.c b/drivers/net/usb/kaweth.c
index ad0298f9b5f..3362449a2d9 100644
--- a/drivers/net/usb/kaweth.c
+++ b/drivers/net/usb/kaweth.c
@@ -1308,7 +1308,7 @@ static int kaweth_internal_control_msg(struct usb_device *usb_dev,
1308 int retv; 1308 int retv;
1309 int length = 0; /* shut up GCC */ 1309 int length = 0; /* shut up GCC */
1310 1310
1311 urb = usb_alloc_urb(0, GFP_NOIO); 1311 urb = usb_alloc_urb(0, GFP_ATOMIC);
1312 if (!urb) 1312 if (!urb)
1313 return -ENOMEM; 1313 return -ENOMEM;
1314 1314