projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 09ebb81)
rsi: GFP_ATOMIC is not needed in rsi_init_usb_interface()
authorAlexey Khoroshilov <khoroshilov@ispras.ru>
Thu, 26 Jun 2014 22:51:24 +0000 (02:51 +0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 1 Jul 2014 18:26:26 +0000 (14:26 -0400)
Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/rsi/rsi_91x_usb.c patch | blob | blame | history

diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c
index 3226f19989e7839e1d11db45c6b49cd759acfe95..f89695abafcd3b8ab3b3dceae053c8c4ccf38e67 100644 (file)
--- 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;