From 698ff5db3a3b29d55ec0920531dbd39716e549ca Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Wed, 20 Apr 2011 10:43:12 +0200
Subject: [PATCH] --- yaml --- r: 248667 b: refs/heads/master c:
 c29bd8d89c9423aed182dbfdb6527b576a2f3552 h: refs/heads/master i:   248665:
 dc7a3c5c60f4b53dcb74babaf360208354f33638   248663:
 f33c1211134224afbddfcf31f51e7caa46044f2c v: v3

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

diff --git a/[refs] b/[refs]
index ac84fbde2afc..a33739832e0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1c43f82c5aa265442f82dba31ce985ebb7aa71c
+refs/heads/master: c29bd8d89c9423aed182dbfdb6527b576a2f3552
diff --git a/trunk/drivers/tty/nozomi.c b/trunk/drivers/tty/nozomi.c
index fd0a98524d51..acaecc173881 100644
--- a/trunk/drivers/tty/nozomi.c
+++ b/trunk/drivers/tty/nozomi.c
@@ -1431,8 +1431,8 @@ static int __devinit nozomi_card_init(struct pci_dev *pdev,
 	}
 
 	for (i = PORT_MDM; i < MAX_PORT; i++) {
-		if (kfifo_alloc(&dc->port[i].fifo_ul,
-		      FIFO_BUFFER_SIZE_UL, GFP_ATOMIC)) {
+		if (kfifo_alloc(&dc->port[i].fifo_ul, FIFO_BUFFER_SIZE_UL,
+					GFP_KERNEL)) {
 			dev_err(&pdev->dev,
 					"Could not allocate kfifo buffer\n");
 			ret = -ENOMEM;