Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[karo-tx-linux.git] / net / nfc / llcp_commands.c

diff --git a/net/nfc/llcp_commands.c b/net/nfc/llcp_commands.c
index 4112d009b032c25e5eb409170d76b8d2486cdffb..c5959ce503e6c857c98d5cb7583f48b42b3eac71 100644 (file)
--- a/net/nfc/llcp_commands.c
+++ b/net/nfc/llcp_commands.c
@@ -444,10 +444,11 @@ int nfc_llcp_send_connect(struct nfc_llcp_sock *sock)
 
        skb_queue_tail(&local->tx_queue, skb);
 
-       return 0;
+       err = 0;
 
 error_tlv:
-       pr_err("error %d\n", err);
+       if (err)
+               pr_err("error %d\n", err);
 
        kfree(service_name_tlv);
        kfree(miux_tlv);
@@ -495,10 +496,11 @@ int nfc_llcp_send_cc(struct nfc_llcp_sock *sock)
 
        skb_queue_tail(&local->tx_queue, skb);
 
-       return 0;
+       err = 0;
 
 error_tlv:
-       pr_err("error %d\n", err);
+       if (err)
+               pr_err("error %d\n", err);
 
        kfree(miux_tlv);
        kfree(rw_tlv);