diff options
author | Aloisio Almeida Jr <aloisio.almeida@openbossa.org> | 2011-07-01 18:31:35 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-07-05 15:26:58 -0400 |
commit | c7fe3b52c1283b8ba810eb6ecddf1c8a0bcc13ab (patch) | |
tree | 12f657e696a5ab06259382b59394f4092749849c /net/nfc/core.c | |
parent | 4d12b8b129f170d0fc3188de1e51a2a1b0f87730 (diff) |
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.c | 7 |
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) | |||
432 | /* the first generation must not be 0 */ | 432 | /* the first generation must not be 0 */ |
433 | nfc_devlist_generation = 1; | 433 | nfc_devlist_generation = 1; |
434 | 434 | ||
435 | rc = af_nfc_init(); | ||
436 | if (rc) | ||
437 | goto err_af_nfc; | ||
438 | |||
435 | return 0; | 439 | return 0; |
436 | 440 | ||
441 | err_af_nfc: | ||
442 | nfc_genl_exit(); | ||
437 | err_genl: | 443 | err_genl: |
438 | class_unregister(&nfc_class); | 444 | class_unregister(&nfc_class); |
439 | return rc; | 445 | return rc; |
@@ -441,6 +447,7 @@ err_genl: | |||
441 | 447 | ||
442 | static void __exit nfc_exit(void) | 448 | static void __exit nfc_exit(void) |
443 | { | 449 | { |
450 | af_nfc_exit(); | ||
444 | nfc_genl_exit(); | 451 | nfc_genl_exit(); |
445 | class_unregister(&nfc_class); | 452 | class_unregister(&nfc_class); |
446 | } | 453 | } |