* Patch "NFC: st21nfcb: Remove inappropriate kfree on a devm_kzalloc pointer" has been added to the 4.1-stable tree
@ 2015-07-30 0:25 gregkh
0 siblings, 0 replies; only message in thread
From: gregkh @ 2015-07-30 0:25 UTC (permalink / raw)
To: firogm, christophe-h.ricard, gregkh, sameo; +Cc: stable, stable-commits
This is a note to let you know that I've just added the patch titled
NFC: st21nfcb: Remove inappropriate kfree on a devm_kzalloc pointer
to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
nfc-st21nfcb-remove-inappropriate-kfree-on-a-devm_kzalloc-pointer.patch
and it can be found in the queue-4.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From 38bd83f04c5e9695011dc5c294e0c4e6a9f9052d Mon Sep 17 00:00:00 2001
From: Firo Yang <firogm@gmail.com>
Date: Sat, 6 Jun 2015 13:16:42 +0200
Subject: NFC: st21nfcb: Remove inappropriate kfree on a devm_kzalloc pointer
From: Firo Yang <firogm@gmail.com>
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@st.com>
Signed-off-by: Firo Yang <firogm@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/nfc/st21nfcb/st21nfcb.c | 3 ---
1 file changed, 3 deletions(-)
--- 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);
Patches currently in stable-queue which might be from firogm@gmail.com are
queue-4.1/nfc-st21nfcb-remove-inappropriate-kfree-on-a-devm_kzalloc-pointer.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-07-30 0:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-30 0:25 Patch "NFC: st21nfcb: Remove inappropriate kfree on a devm_kzalloc pointer" has been added to the 4.1-stable tree gregkh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).