summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZiyang Xuan <william.xuanziyang@huawei.com>2021-10-13 11:49:32 +0800
committerJakub Kicinski <kuba@kernel.org>2021-10-13 17:32:38 -0700
commit0911ab31896f0e908540746414a77dd63912748d (patch)
tree84f7711856e1b7b588da69295d172aa0897cc24b
parent1f922d9e374f0ca7d1b241666c792f403c6120aa (diff)
downloadlwn-0911ab31896f0e908540746414a77dd63912748d.tar.gz
lwn-0911ab31896f0e908540746414a77dd63912748d.zip
nfc: fix error handling of nfc_proto_register()
When nfc proto id is using, nfc_proto_register() return -EBUSY error code, but forgot to unregister proto. Fix it by adding proto_unregister() in the error handling case. Fixes: c7fe3b52c128 ("NFC: add NFC socket family") Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com> Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Link: https://lore.kernel.org/r/20211013034932.2833737-1-william.xuanziyang@huawei.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-rw-r--r--net/nfc/af_nfc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/nfc/af_nfc.c b/net/nfc/af_nfc.c
index 6024fad905ff..dda323e0a473 100644
--- a/net/nfc/af_nfc.c
+++ b/net/nfc/af_nfc.c
@@ -60,6 +60,9 @@ int nfc_proto_register(const struct nfc_protocol *nfc_proto)
proto_tab[nfc_proto->id] = nfc_proto;
write_unlock(&proto_tab_lock);
+ if (rc)
+ proto_unregister(nfc_proto->proto);
+
return rc;
}
EXPORT_SYMBOL(nfc_proto_register);