diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2011-04-20 10:43:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-25 14:19:10 -0700 |
| commit | c29bd8d89c9423aed182dbfdb6527b576a2f3552 (patch) | |
| tree | 51029e6774dd10640a4b90cb56f90e4c879ee3e1 /drivers/tty | |
| parent | b1c43f82c5aa265442f82dba31ce985ebb7aa71c (diff) | |
| download | op-kernel-dev-c29bd8d89c9423aed182dbfdb6527b576a2f3552.zip op-kernel-dev-c29bd8d89c9423aed182dbfdb6527b576a2f3552.tar.gz | |
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')
| -rw-r--r-- | drivers/tty/nozomi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c index fd0a9852..acaecc1 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; |
