aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/nfc/s3fwrn5/core.c
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2020-08-11 01:58:31 +0000
committerDave Airlie <[email protected]>2020-08-11 01:58:31 +0000
commitc44264f9f729fd63bd6a81a6ac5cd6cd49af09e5 (patch)
treead77b18ffeafb50b3eb9ba6472670dc1d96f5558 /drivers/nfc/s3fwrn5/core.c
parentMerge tag 'drm-misc-next-fixes-2020-08-05' of git://anongit.freedesktop.org/d... (diff)
parentLinux 5.8 (diff)
downloadkernel-c44264f9f729fd63bd6a81a6ac5cd6cd49af09e5.tar.gz
kernel-c44264f9f729fd63bd6a81a6ac5cd6cd49af09e5.zip
Merge tag 'v5.8' into drm-next
I need to backmerge 5.8 as I've got a bunch of fixes sitting on an rc7 base that I want to land. Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'drivers/nfc/s3fwrn5/core.c')
-rw-r--r--drivers/nfc/s3fwrn5/core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nfc/s3fwrn5/core.c b/drivers/nfc/s3fwrn5/core.c
index 91d4d5b28a7d..ba6c486d6465 100644
--- a/drivers/nfc/s3fwrn5/core.c
+++ b/drivers/nfc/s3fwrn5/core.c
@@ -198,6 +198,7 @@ int s3fwrn5_recv_frame(struct nci_dev *ndev, struct sk_buff *skb,
case S3FWRN5_MODE_FW:
return s3fwrn5_fw_recv_frame(ndev, skb);
default:
+ kfree_skb(skb);
return -ENODEV;
}
}