From c29bd8d89c9423aed182dbfdb6527b576a2f3552 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Wed, 20 Apr 2011 10:43:12 +0200 Subject: 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 Tested-by: Gerald Pfeifer Signed-off-by: Greg Kroah-Hartman --- drivers/tty/nozomi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers') 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; -- cgit v1.2.3