From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Wed, 21 Aug 2013 11:27:40 +0000 (+0300)
Subject: iwlwifi: mvm: don't sleep while allocating in atomic context
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3394817f833f13958320ae6e0dccf347c1ce5200;p=linux-beck.git

iwlwifi: mvm: don't sleep while allocating in atomic context

We want to dump the SRAM when we have an error interrupt
from the device. This happens in non-sleepable context,
hence the change.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/drivers/net/wireless/iwlwifi/mvm/utils.c b/drivers/net/wireless/iwlwifi/mvm/utils.c
index a9c357491434..ed69e9b78e82 100644
--- a/drivers/net/wireless/iwlwifi/mvm/utils.c
+++ b/drivers/net/wireless/iwlwifi/mvm/utils.c
@@ -466,7 +466,7 @@ void iwl_mvm_dump_sram(struct iwl_mvm *mvm)
 	ofs = img->sec[IWL_UCODE_SECTION_DATA].offset;
 	len = img->sec[IWL_UCODE_SECTION_DATA].len;
 
-	buf = kzalloc(len, GFP_KERNEL);
+	buf = kzalloc(len, GFP_ATOMIC);
 	if (!buf)
 		return;