Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[linux.git] / net / nfc / nci / uart.c

diff --git a/net/nfc/nci/uart.c b/net/nfc/nci/uart.c
index 78fe622eba6579979f392ec0b03fd8627638a755..11b554ce07ffcc1ea20b8c388206ca1504fc4405 100644 (file)
--- a/net/nfc/nci/uart.c
+++ b/net/nfc/nci/uart.c
@@ -346,7 +346,7 @@ static int nci_uart_default_recv_buf(struct nci_uart *nu, const u8 *data,
                        nu->rx_packet_len = -1;
                        nu->rx_skb = nci_skb_alloc(nu->ndev,
                                                   NCI_MAX_PACKET_SIZE,
-                                                  GFP_KERNEL);
+                                                  GFP_ATOMIC);
                        if (!nu->rx_skb)
                                return -ENOMEM;
                }