Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[deliverable/linux.git] / drivers / thermal / thermal_core.c

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 87e0b0782023cb37696a92150d9f0c10bd09b198..48491d1a81d650f1d10812c1fb8d5e05ff99cbe1 100644 (file)
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -1759,11 +1759,7 @@ int thermal_generate_netlink_event(struct thermal_zone_device *tz,
        thermal_event->event = event;
 
        /* send multicast genetlink message */
-       result = genlmsg_end(skb, msg_header);
-       if (result < 0) {
-               nlmsg_free(skb);
-               return result;
-       }
+       genlmsg_end(skb, msg_header);
 
        result = genlmsg_multicast(&thermal_event_genl_family, skb, 0,
                                   0, GFP_ATOMIC);