diff options
| author | Denys Drozdov <denys.drozdov@toradex.com> | 2022-01-12 14:02:54 +0200 |
|---|---|---|
| committer | Denys Drozdov <denys.drozdov@toradex.com> | 2022-01-12 14:02:54 +0200 |
| commit | 0021a0c8a58ff37f62f4d2424dca7c6a6d9f233d (patch) | |
| tree | 2dd57ed085b1fdf17f9e79e963f1d02051bc76d3 /net/nfc/nci/rsp.c | |
| parent | 5b3083e6d7a98e4afec861060537004772dc4acf (diff) | |
| parent | 712fcc850e5a6d0867b0d97a0b79f1addd01998f (diff) | |
Merge remote-tracking branch 'fscl/5.4-2.3.x-imx' into toradex_5.4-2.3.x-imx-v5.4.161
Conflicts:
drivers/net/phy/micrel.c
drivers/usb/chipidea/core.c
Diffstat (limited to 'net/nfc/nci/rsp.c')
| -rw-r--r-- | net/nfc/nci/rsp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/nfc/nci/rsp.c b/net/nfc/nci/rsp.c index a48297b79f34..b0ed2b47ac43 100644 --- a/net/nfc/nci/rsp.c +++ b/net/nfc/nci/rsp.c @@ -277,6 +277,8 @@ static void nci_core_conn_close_rsp_packet(struct nci_dev *ndev, ndev->cur_conn_id); if (conn_info) { list_del(&conn_info->list); + if (conn_info == ndev->rf_conn_info) + ndev->rf_conn_info = NULL; devm_kfree(&ndev->nfc_dev->dev, conn_info); } } |