diff options
| author | David S. Miller <davem@davemloft.net> | 2022-05-01 13:26:05 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-05-01 13:26:05 +0100 |
| commit | b6693611f71e1b9107a2d178c1f7d92c7d850891 (patch) | |
| tree | 7a789b0a2ced44eae4184f50fd25040ad0b7c609 /drivers | |
| parent | 47f753c1108e287edb3e27fad8a7511a9d55578e (diff) | |
| parent | d270453a0d9ec10bb8a802a142fb1b3601a83098 (diff) | |
Merge branch 'nfc-fixes'
Duoming Zhou says:
====================
Replace improper checks and fix bugs in nfc subsystem
The first patch is used to replace improper checks in netlink related
functions of nfc core, the second patch is used to fix bugs in
nfcmrvl driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/nfc/nfcmrvl/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/nfcmrvl/main.c b/drivers/nfc/nfcmrvl/main.c index 2fcf545012b1..1a5284de4341 100644 --- a/drivers/nfc/nfcmrvl/main.c +++ b/drivers/nfc/nfcmrvl/main.c @@ -183,6 +183,7 @@ void nfcmrvl_nci_unregister_dev(struct nfcmrvl_private *priv) { struct nci_dev *ndev = priv->ndev; + nci_unregister_device(ndev); if (priv->ndev->nfc_dev->fw_download_in_progress) nfcmrvl_fw_dnld_abort(priv); @@ -191,7 +192,6 @@ void nfcmrvl_nci_unregister_dev(struct nfcmrvl_private *priv) if (gpio_is_valid(priv->config.reset_n_io)) gpio_free(priv->config.reset_n_io); - nci_unregister_device(ndev); nci_free_device(ndev); kfree(priv); } |