diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-27 12:42:15 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-27 12:42:15 +0200 |
| commit | 908e757daecf2120c3019fa630ae5d4c3cd7165b (patch) | |
| tree | 652b0f3ecd4a6d7c0066169d6ae466711300197c /drivers/nfc | |
| parent | staging: comedi: addi: Replace HTTP links with HTTPS ones (diff) | |
| parent | Linux 5.8-rc7 (diff) | |
| download | linux-908e757daecf2120c3019fa630ae5d4c3cd7165b.tar.xz linux-908e757daecf2120c3019fa630ae5d4c3cd7165b.zip | |
Merge 5.8-rc7 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/nfc')
| -rw-r--r-- | drivers/nfc/s3fwrn5/core.c | 1 |
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; } } |