diff options
| -rw-r--r-- | drivers/nfc/pn533/usb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nfc/pn533/usb.c b/drivers/nfc/pn533/usb.c index d5553c47014f..5d823e965883 100644 --- a/drivers/nfc/pn533/usb.c +++ b/drivers/nfc/pn533/usb.c | |||
| @@ -74,7 +74,7 @@ static void pn533_recv_response(struct urb *urb) | |||
| 74 | struct sk_buff *skb = NULL; | 74 | struct sk_buff *skb = NULL; |
| 75 | 75 | ||
| 76 | if (!urb->status) { | 76 | if (!urb->status) { |
| 77 | skb = alloc_skb(urb->actual_length, GFP_KERNEL); | 77 | skb = alloc_skb(urb->actual_length, GFP_ATOMIC); |
| 78 | if (!skb) { | 78 | if (!skb) { |
| 79 | nfc_err(&phy->udev->dev, "failed to alloc memory\n"); | 79 | nfc_err(&phy->udev->dev, "failed to alloc memory\n"); |
| 80 | } else { | 80 | } else { |
| @@ -186,7 +186,7 @@ static int pn533_usb_send_frame(struct pn533 *dev, | |||
| 186 | 186 | ||
| 187 | if (dev->protocol_type == PN533_PROTO_REQ_RESP) { | 187 | if (dev->protocol_type == PN533_PROTO_REQ_RESP) { |
| 188 | /* request for response for sent packet directly */ | 188 | /* request for response for sent packet directly */ |
| 189 | rc = pn533_submit_urb_for_response(phy, GFP_ATOMIC); | 189 | rc = pn533_submit_urb_for_response(phy, GFP_KERNEL); |
| 190 | if (rc) | 190 | if (rc) |
| 191 | goto error; | 191 | goto error; |
| 192 | } else if (dev->protocol_type == PN533_PROTO_REQ_ACK_RESP) { | 192 | } else if (dev->protocol_type == PN533_PROTO_REQ_ACK_RESP) { |
