]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
NFC: st21nfcb: Remove inappropriate kfree on a devm_kzalloc pointer
authorFiro Yang <firogm@gmail.com>
Sat, 6 Jun 2015 11:16:42 +0000 (13:16 +0200)
committerSasha Levin <sasha.levin@oracle.com>
Sat, 4 Jul 2015 03:02:25 +0000 (23:02 -0400)
[ 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>
drivers/nfc/st21nfcb/st21nfcb.c

index ea63d5877831bf40b3dafbc059ef6651bf3c9a28..28b39143a830697ba4ccafb3ed43e80c29ec6be2 100644 (file)
@@ -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);