From: Jiri Slaby <jslaby@suse.cz>
Date: Wed, 20 Apr 2011 08:43:12 +0000 (+0200)
Subject: Char: nozomi, use GFP_KERNEL for kfifo allocation
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c29bd8d89c9423aed182dbfdb6527b576a2f3552;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Char: nozomi, use GFP_KERNEL for kfifo allocation

The allocation was moved to probe function in 9842c38e9176. And we can
sleep there. So allocate the 4*8192 bytes as GFP_KERNEL to mitigate
the allocation failure.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Tested-by: Gerald Pfeifer <gerald@pfeifer.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index fd0a98524d51..acaecc173881 100644
--- a/drivers/tty/nozomi.c
+++ b/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;