Merge "FM: fix the bug where SMD interrupts might not be processed" into msm-3.0
diff --git a/drivers/media/radio/radio-iris-transport.c b/drivers/media/radio/radio-iris-transport.c
index 6628c9d..50ca58c 100644
--- a/drivers/media/radio/radio-iris-transport.c
+++ b/drivers/media/radio/radio-iris-transport.c
@@ -51,13 +51,13 @@
 	len = smd_read_avail(hsmd->fm_channel);
 
 	while (len) {
-		skb = alloc_skb(len, GFP_KERNEL);
+		skb = alloc_skb(len, GFP_ATOMIC);
 		if (!skb) {
 			FMDERR("Memory not allocated for the socket");
 			return;
 		}
 
-		buf = kmalloc(len, GFP_KERNEL);
+		buf = kmalloc(len, GFP_ATOMIC);
 		if (!buf) {
 			kfree_skb(skb);
 			FMDERR("Error in allocating buffer memory");