summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
diff options
context:
space:
mode:
authorFiro Yang <firogm@gmail.com>2015-06-06 13:16:42 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2015-06-09 00:34:22 +0200
commit38bd83f04c5e9695011dc5c294e0c4e6a9f9052d (patch)
tree2a1b91d999e8f4ce753711206cfd266d7f5459fd /drivers/nfc
parent759afb8d288ffbe9a1cdb20af037b5c072dc38b2 (diff)
downloadop-kernel-dev-38bd83f04c5e9695011dc5c294e0c4e6a9f9052d.zip
op-kernel-dev-38bd83f04c5e9695011dc5c294e0c4e6a9f9052d.tar.gz
NFC: st21nfcb: Remove inappropriate kfree on a devm_kzalloc pointer
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>
Diffstat (limited to 'drivers/nfc')
-rw-r--r--drivers/nfc/st21nfcb/st21nfcb.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/nfc/st21nfcb/st21nfcb.c b/drivers/nfc/st21nfcb/st21nfcb.c
index ca9871a..c7dc282 100644
--- a/drivers/nfc/st21nfcb/st21nfcb.c
+++ b/drivers/nfc/st21nfcb/st21nfcb.c
@@ -131,11 +131,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);
OpenPOWER on IntegriCloud