From 5ae9ac5bdfd6fab04b5505298d8f25396c1db503 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Sun, 25 Jun 2006 05:48:41 -0700
Subject: [PATCH] --- yaml --- r: 29763 b: refs/heads/master c:
 78dbe706e22f54bce61571ad837238382e1ba5f9 h: refs/heads/master i:   29761:
 a89cdae46c9827f8a366d62e7a1d0c2dc7751611   29759:
 606f6106102bb743c282e7f29c2caa46dd84a175 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/char/n_r3964.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 69a3019467c5..01f2cce6ab1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c836043e708d50bb301479d0db8e0dc77d4f52ca
+refs/heads/master: 78dbe706e22f54bce61571ad837238382e1ba5f9
diff --git a/trunk/drivers/char/n_r3964.c b/trunk/drivers/char/n_r3964.c
index c48de09d68f0..203dc2b661d5 100644
--- a/trunk/drivers/char/n_r3964.c
+++ b/trunk/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;