Merge tag 'stable/for-linus-3.5-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / net / wireless / hostap / hostap_main.c

diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index bfa0d54221e8f48d4201f62b4a44ba777067f2fa..627bc12074c729a37426199e52cb119dce01fdda 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -244,8 +244,7 @@ u16 hostap_tx_callback_register(local_info_t *local,
        unsigned long flags;
        struct hostap_tx_callback_info *entry;
 
-       entry = kmalloc(sizeof(*entry),
-                                                          GFP_ATOMIC);
+       entry = kmalloc(sizeof(*entry), GFP_KERNEL);
        if (entry == NULL)
                return 0;