X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=drivers%2Fchar%2Fn_r3964.c;h=203dc2b661d5cc8b4bba97e79b893650c0c3773b;hb=1399ff54741b3aa0aaf5097b8559fa30277ebe61;hp=c48de09d68f0fd1c6b5334744305eb69a650d6d7;hpb=37ef4399a6bb265d3035e6d6e45f7677b132a3ba;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/char/n_r3964.c b/drivers/char/n_r3964.c
index c48de09d68f..203dc2b661d 100644
--- a/drivers/char/n_r3964.c
+++ b/drivers/char/n_r3964.c
@@ -951,7 +951,8 @@ static void add_msg(struct r3964_client_info *pClient, int msg_id, int arg,
    {
 queue_the_message:
 
-      pMsg = kmalloc(sizeof(struct r3964_message), GFP_KERNEL);
+      pMsg = kmalloc(sizeof(struct r3964_message),
+		     error_code?GFP_ATOMIC:GFP_KERNEL);
       TRACE_M("add_msg - kmalloc %p",pMsg);
       if(pMsg==NULL) {
          return;