diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2019-09-22 22:29:00 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2019-09-22 22:29:00 +0200 |
| commit | 53c716412708db7000e06292fb89b2609f9a48f7 (patch) | |
| tree | 3ede481ee0926f0e53e14bba61028d307d58296c /drivers/nfc/st21nfca/se.c | |
| parent | e6d64ce06c28b615ebfeab7b8bfad6136ea83095 (diff) | |
| parent | aec256d0ecd561036f188dbc8fa7924c47a9edfd (diff) | |
Merge branch 'for-5.4/apple' into for-linus
- stuck 'fn' key fix for hid-apple from Joao Moreno
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/nfc/st21nfca/se.c')
| -rw-r--r-- | drivers/nfc/st21nfca/se.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/nfc/st21nfca/se.c b/drivers/nfc/st21nfca/se.c index 06fc542fd198..6586378cacb0 100644 --- a/drivers/nfc/st21nfca/se.c +++ b/drivers/nfc/st21nfca/se.c @@ -317,6 +317,8 @@ int st21nfca_connectivity_event_received(struct nfc_hci_dev *hdev, u8 host, transaction = (struct nfc_evt_transaction *)devm_kzalloc(dev, skb->len - 2, GFP_KERNEL); + if (!transaction) + return -ENOMEM; transaction->aid_len = skb->data[1]; memcpy(transaction->aid, &skb->data[2], |