Merge tag 'arc-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[firefly-linux-kernel-4.4.55.git] / net / netlabel / netlabel_cipso_v4.c

diff --git a/net/netlabel/netlabel_cipso_v4.c b/net/netlabel/netlabel_cipso_v4.c
index c2f2a53a487919bcb45e882b9ff8859c699b9d56..7fd1104ba9007ec0d731d97d0a245eb3da7b4436 100644 (file)
--- a/net/netlabel/netlabel_cipso_v4.c
+++ b/net/netlabel/netlabel_cipso_v4.c
@@ -324,8 +324,7 @@ static int netlbl_cipsov4_add_std(struct genl_info *info,
        return 0;
 
 add_std_failure:
-       if (doi_def)
-               cipso_v4_doi_free(doi_def);
+       cipso_v4_doi_free(doi_def);
        return ret_val;
 }
 
@@ -641,7 +640,8 @@ static int netlbl_cipsov4_listall_cb(struct cipso_v4_doi *doi_def, void *arg)
        if (ret_val != 0)
                goto listall_cb_failure;
 
-       return genlmsg_end(cb_arg->skb, data);
+       genlmsg_end(cb_arg->skb, data);
+       return 0;
 
 listall_cb_failure:
        genlmsg_cancel(cb_arg->skb, data);