diff options
| author | Firo Yang <firogm@gmail.com> | 2015-06-06 14:16:42 +0300 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-07-04 06:02:25 +0300 |
| commit | a119af5a95c10e72ee9b5b2e3cb7f1ea5094aed2 (patch) | |
| tree | 5ff5e8838e90a58c101ade9345c62a55083d757d /drivers/nfc | |
| parent | 27a0cc563105b7346c91520d36aabf721e50878d (diff) | |
| download | linux-a119af5a95c10e72ee9b5b2e3cb7f1ea5094aed2.tar.xz | |
NFC: st21nfcb: Remove inappropriate kfree on a devm_kzalloc pointer
[ Upstream commit 38bd83f04c5e9695011dc5c294e0c4e6a9f9052d ]
Since ndev->driver_data is allocated by devm_kzalloc(), we do not
need the inappropriate kfree to free it in driver's remove function.
Freeing will trigger when driver unloads.
Cc: stable@vger.kernel.org
Acked-by: Christophe Ricard <christophe-h.ricard@st.com>
Signed-off-by: Firo Yang <firogm@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/nfc')
| -rw-r--r-- | drivers/nfc/st21nfcb/st21nfcb.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/nfc/st21nfcb/st21nfcb.c b/drivers/nfc/st21nfcb/st21nfcb.c index ea63d5877831..28b39143a830 100644 --- a/drivers/nfc/st21nfcb/st21nfcb.c +++ b/drivers/nfc/st21nfcb/st21nfcb.c @@ -122,11 +122,8 @@ EXPORT_SYMBOL_GPL(st21nfcb_nci_probe); void st21nfcb_nci_remove(struct nci_dev *ndev) { - struct st21nfcb_nci_info *info = nci_get_drvdata(ndev); - nci_unregister_device(ndev); nci_free_device(ndev); - kfree(info); } EXPORT_SYMBOL_GPL(st21nfcb_nci_remove); |