summary refs log tree commit diff
path: root/net/nfc/core.c
diff options
context:
space:
mode:
authorAloisio Almeida Jr <aloisio.almeida@openbossa.org>2011-07-01 19:31:35 -0300
committerJohn W. Linville <linville@tuxdriver.com>2011-07-05 15:26:58 -0400
commitc7fe3b52c1283b8ba810eb6ecddf1c8a0bcc13ab (patch)
tree12f657e696a5ab06259382b59394f4092749849c /net/nfc/core.c
parent4d12b8b129f170d0fc3188de1e51a2a1b0f87730 (diff)
downloadlinux-c7fe3b52c1283b8ba810eb6ecddf1c8a0bcc13ab.tar.gz
NFC: add NFC socket family
Signed-off-by: Lauro Ramos Venancio <lauro.venancio@openbossa.org>
Signed-off-by: Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/nfc/core.c')
-rw-r--r--net/nfc/core.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/net/nfc/core.c b/net/nfc/core.c
index c70f607455c5..e804dc50f42f 100644
--- a/net/nfc/core.c
+++ b/net/nfc/core.c
@@ -432,8 +432,14 @@ static int __init nfc_init(void)
 	/* the first generation must not be 0 */
 	nfc_devlist_generation = 1;
 
+	rc = af_nfc_init();
+	if (rc)
+		goto err_af_nfc;
+
 	return 0;
 
+err_af_nfc:
+	nfc_genl_exit();
 err_genl:
 	class_unregister(&nfc_class);
 	return rc;
@@ -441,6 +447,7 @@ err_genl:
 
 static void __exit nfc_exit(void)
 {
+	af_nfc_exit();
 	nfc_genl_exit();
 	class_unregister(&nfc_class);
 }