Merge branch 'thinkpad' into release

[mv-sheeva.git] / net / netlabel / netlabel_kapi.c

diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
index 16e6c4378ff18907e486d5625f09af57b27e153e..6ce00205f3425cd079b7a64526db259f9ae58d47 100644 (file)
--- a/net/netlabel/netlabel_kapi.c
+++ b/net/netlabel/netlabel_kapi.c
@@ -185,8 +185,7 @@ int netlbl_cfg_unlbl_map_add(const char *domain,
        return 0;
 
 cfg_unlbl_map_add_failure:
-       if (entry != NULL)
-               kfree(entry->domain);
+       kfree(entry->domain);
        kfree(entry);
        kfree(addrmap);
        kfree(map4);
@@ -385,8 +384,7 @@ int netlbl_cfg_cipsov4_map_add(u32 doi,
 
 cfg_cipsov4_map_add_failure:
        cipso_v4_doi_putdef(doi_def);
-       if (entry != NULL)
-               kfree(entry->domain);
+       kfree(entry->domain);
        kfree(entry);
        kfree(addrmap);
        kfree(addrinfo);