[3.19.y-ckt stable] Patch "NFC: st21nfcb: Remove inappropriate kfree on a devm_kzalloc pointer" has been added to staging queue
Kamal Mostafa
kamal at canonical.com
Thu Jul 16 01:00:35 UTC 2015
This is a note to let you know that I have just added a patch titled
NFC: st21nfcb: Remove inappropriate kfree on a devm_kzalloc pointer
to the linux-3.19.y-queue branch of the 3.19.y-ckt extended stable tree
which can be found at:
http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.19.y-queue
This patch is scheduled to be released in version 3.19.y-ckt4.
If you, or anyone else, feels it should not be added to this tree, please
reply to this email.
For more information about the 3.19.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
Thanks.
-Kamal
------
>From c2ca68fc5f3261ce780351dce6247615f8e1b3f3 Mon Sep 17 00:00:00 2001
From: Firo Yang <firogm at gmail.com>
Date: Sat, 6 Jun 2015 13:16:42 +0200
Subject: NFC: st21nfcb: Remove inappropriate kfree on a devm_kzalloc pointer
commit 38bd83f04c5e9695011dc5c294e0c4e6a9f9052d upstream.
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.
Acked-by: Christophe Ricard <christophe-h.ricard at st.com>
Signed-off-by: Firo Yang <firogm at gmail.com>
Signed-off-by: Samuel Ortiz <sameo at linux.intel.com>
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
drivers/nfc/st21nfcb/st21nfcb.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/nfc/st21nfcb/st21nfcb.c b/drivers/nfc/st21nfcb/st21nfcb.c
index ea63d58..28b3914 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);
--
1.9.1
More information about the kernel-team
mailing list