Browse Source

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>
Jiri Slaby 14 năm trước cách đây
mục cha
commit
c29bd8d89c
1 tập tin đã thay đổi với 2 bổ sung2 xóa
  1. 2 2
      drivers/tty/nozomi.c

+ 2 - 2
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++) {
 	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,
 			dev_err(&pdev->dev,
 					"Could not allocate kfifo buffer\n");
 					"Could not allocate kfifo buffer\n");
 			ret = -ENOMEM;
 			ret = -ENOMEM;