aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRom Lemarchand <rlemarchand@sta.samsung.com>2011-03-25 15:21:35 -0700
committerArve Hjønnevåg <arve@android.com>2011-11-17 17:53:47 -0800
commit2a5fd3bd9ab9e2ef5e20e771f7ccd648de65ab7a (patch)
tree561834999e88d3152d21124aaba1bd4acd3e6ed0
parentaf5b8a5c105d5b08ee77594701e9682462768466 (diff)
downloadkernel_samsung_crespo-2a5fd3bd9ab9e2ef5e20e771f7ccd648de65ab7a.zip
kernel_samsung_crespo-2a5fd3bd9ab9e2ef5e20e771f7ccd648de65ab7a.tar.gz
kernel_samsung_crespo-2a5fd3bd9ab9e2ef5e20e771f7ccd648de65ab7a.tar.bz2
net: wimax: cmc7xx: alloc with GFP_ATOMIC in ctrl
Using ATOMIC in control_send as it is scheduled under atomic. Change-Id: I44840db77b9867b8e53f87f245aa062b35824cba Signed-off-by: sangamanatha <sangam.swamy@samsung.com>
-rwxr-xr-xdrivers/net/wimax/cmc7xx/control.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wimax/cmc7xx/control.c b/drivers/net/wimax/cmc7xx/control.c
index cba2501..1dcaad7 100755
--- a/drivers/net/wimax/cmc7xx/control.c
+++ b/drivers/net/wimax/cmc7xx/control.c
@@ -133,10 +133,10 @@ u32 control_send(struct net_adapter *adapter, void *buffer, u32 length)
return STATUS_RESOURCES;/* changed from SUCCESS return status */
bufdsc = (struct buffer_descriptor *)
- kmalloc(sizeof(*bufdsc), GFP_KERNEL);
+ kmalloc(sizeof(*bufdsc), GFP_ATOMIC);
if (bufdsc == NULL)
return STATUS_RESOURCES;
- bufdsc->buffer = kmalloc(BUFFER_DATA_SIZE, GFP_KERNEL);
+ bufdsc->buffer = kmalloc(BUFFER_DATA_SIZE, GFP_ATOMIC);
if (bufdsc->buffer == NULL) {
kfree(bufdsc);
return STATUS_RESOURCES;