---

yaml --- r: 248667 b: refs/heads/master c: c29bd8d h: refs/heads/master i: 248665: dc7a3c5 248663: f33c121 v: v3
git-mirror · Apr 25, 2011 · 698ff5d · 698ff5d
1 parent 606ef55
commit 698ff5d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;