aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/nozomi.c
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2011-04-20 04:43:12 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-25 17:19:10 -0400
commitc29bd8d89c9423aed182dbfdb6527b576a2f3552 (patch)
tree51029e6774dd10640a4b90cb56f90e4c879ee3e1 /drivers/tty/nozomi.c
parentb1c43f82c5aa265442f82dba31ce985ebb7aa71c (diff)
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>
Diffstat (limited to 'drivers/tty/nozomi.c')
-rw-r--r--drivers/tty/nozomi.c4
1 files changed, 2 insertions, 2 deletions
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,
1431 } 1431 }
1432 1432
1433 for (i = PORT_MDM; i < MAX_PORT; i++) { 1433 for (i = PORT_MDM; i < MAX_PORT; i++) {
1434 if (kfifo_alloc(&dc->port[i].fifo_ul, 1434 if (kfifo_alloc(&dc->port[i].fifo_ul, FIFO_BUFFER_SIZE_UL,
1435 FIFO_BUFFER_SIZE_UL, GFP_ATOMIC)) { 1435 GFP_KERNEL)) {
1436 dev_err(&pdev->dev, 1436 dev_err(&pdev->dev,
1437 "Could not allocate kfifo buffer\n"); 1437 "Could not allocate kfifo buffer\n");
1438 ret = -ENOMEM; 1438 ret = -ENOMEM;