summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2013-05-10 17:53:29 +0400
committerSamuel Ortiz <sameo@linux.intel.com>2013-06-14 15:45:00 +0400
commitee656e9d0993144f4e4ad261aefeeaab9554cd3f (patch)
tree03d990b310cd75edfcf6079777c6619ff4b50ebc
parent2757c3723c3d2b13e3a8bfaa034826f64e9cca43 (diff)
downloadlinux-ee656e9d0993144f4e4ad261aefeeaab9554cd3f.tar.xz
NFC: Remove and free all SEs when releasing an NFC device
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--net/nfc/core.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/net/nfc/core.c b/net/nfc/core.c
index bb5f16cfc201..5b60b9ddfc8f 100644
--- a/net/nfc/core.c
+++ b/net/nfc/core.c
@@ -820,11 +820,19 @@ EXPORT_SYMBOL(nfc_remove_se);
static void nfc_release(struct device *d)
{
struct nfc_dev *dev = to_nfc_dev(d);
+ struct nfc_se *se, *n;
pr_debug("dev_name=%s\n", dev_name(&dev->dev));
nfc_genl_data_exit(&dev->genl_data);
kfree(dev->targets);
+
+ list_for_each_entry_safe(se, n, &dev->secure_elements, list) {
+ nfc_genl_se_removed(dev, se->idx);
+ list_del(&se->list);
+ kfree(se);
+ }
+
kfree(dev);
}