From: Alexey Khoroshilov Date: Thu, 26 Jun 2014 22:51:24 +0000 (+0400) Subject: rsi: GFP_ATOMIC is not needed in rsi_init_usb_interface() X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=5bc5ca85d54e0176cb967f550093f42bb0d65b67;p=deliverable%2Flinux.git rsi: GFP_ATOMIC is not needed in rsi_init_usb_interface() Signed-off-by: Alexey Khoroshilov Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c index 3226f19989e7..f89695abafcd 100644 --- a/drivers/net/wireless/rsi/rsi_91x_usb.c +++ b/drivers/net/wireless/rsi/rsi_91x_usb.c @@ -397,7 +397,7 @@ static int rsi_init_usb_interface(struct rsi_hw *adapter, return -ENOMEM; } - rsi_dev->tx_buffer = kmalloc(2048, GFP_ATOMIC); + rsi_dev->tx_buffer = kmalloc(2048, GFP_KERNEL); rsi_dev->rx_usb_urb[0] = usb_alloc_urb(0, GFP_KERNEL); rsi_dev->rx_usb_urb[0]->transfer_buffer = adapter->priv->rx_data_pkt; rsi_dev->tx_blk_size = 252;