aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorAdham Abozaeid <adham.abozaeid@microchip.com>2019-04-16 23:17:07 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-04-17 12:40:51 +0200
commit2e299cc96952ab5709e809947a6a4ac66f60fdaf (patch)
tree1f965c95eb250ba8d426347564017afba06d6d5d /drivers/staging
parentstaging: comedi: dyna_pci10xx: Set number of AO channels to 1 (diff)
downloadlinux-dev-2e299cc96952ab5709e809947a6a4ac66f60fdaf.tar.xz
linux-dev-2e299cc96952ab5709e809947a6a4ac66f60fdaf.zip
staging: wilc1000: Avoid GFP_KERNEL allocation from atomic context
txq_add_mgmt_pkt allocates memory while being called from atomic context so needs to use GFP_ATOMIC Signed-off-by: Adham Abozaeid <adham.abozaeid@microchip.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/wilc1000/wilc_wlan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 2b309c8a8fb2..0a713409ea98 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -316,7 +316,7 @@ int wilc_wlan_txq_add_mgmt_pkt(struct net_device *dev, void *priv, u8 *buffer,
if (wilc->quit)
return 0;
- tqe = kmalloc(sizeof(*tqe), GFP_KERNEL);
+ tqe = kmalloc(sizeof(*tqe), GFP_ATOMIC);
if (!tqe)
return 0;