From f71721f8ae16f7bde13ca8bd5546950ccf2145e5 Mon Sep 17 00:00:00 2001
From: Abhishek Singh <absingh@codeaurora.org>
Date: Thu, 2 Feb 2017 11:06:09 +0530
Subject: [PATCH] qcacmn: In qdf malloc use GFP_ATOMIC if in_atomic is set

Currently GFP_KERNEL flag is used to get memory in qdf malloc
even if in_atomic is set.

So in qdf malloc use GFP_ATOMIC if in_atomic is set.

Change-Id: I1992ab4f6c868fcc18285c5cca9c9997433936bf
CRs-Fixed: 1117206
---
 qdf/linux/src/qdf_mem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qdf/linux/src/qdf_mem.c b/qdf/linux/src/qdf_mem.c
index 9d02ae0e35a9..0a84fed99d19 100644
--- a/qdf/linux/src/qdf_mem.c
+++ b/qdf/linux/src/qdf_mem.c
@@ -1086,7 +1086,7 @@ void *qdf_mem_malloc(size_t size)
 {
 	int flags = GFP_KERNEL;
 
-	if (in_interrupt() || irqs_disabled())
+	if (in_interrupt() || irqs_disabled() || in_atomic())
 		flags = GFP_ATOMIC;
 
 	return kzalloc(size, flags);