From b05fc29292b2b39e243b7ae8f07e2bff313f29ac Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 26 May 2011 16:25:15 -0700
Subject: [PATCH] --- yaml --- r: 252025 b: refs/heads/master c:
 4ed960b14d3b5fd14f1d9eb02f6d7e398317627a h: refs/heads/master i:   252023:
 90abf8d955c4e43b1e9bbaa1e5220039e9cc0e59 v: v3

---
 [refs]                                     | 2 +-
 trunk/Documentation/accounting/getdelays.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8a8b7e5cb2a9..e9eedc05649a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbdd91a6293f5e7fb1914966f5d244f72619641e
+refs/heads/master: 4ed960b14d3b5fd14f1d9eb02f6d7e398317627a
diff --git a/trunk/Documentation/accounting/getdelays.c b/trunk/Documentation/accounting/getdelays.c
index 16e16d57b9eb..fed225401dd2 100644
--- a/trunk/Documentation/accounting/getdelays.c
+++ b/trunk/Documentation/accounting/getdelays.c
@@ -177,6 +177,8 @@ static int get_family_id(int sd)
 	rc = send_cmd(sd, GENL_ID_CTRL, getpid(), CTRL_CMD_GETFAMILY,
 			CTRL_ATTR_FAMILY_NAME, (void *)name,
 			strlen(TASKSTATS_GENL_NAME)+1);
+	if (rc < 0)
+		return 0;	/* sendto() failure? */
 
 	rep_len = recv(sd, &ans, sizeof(ans), 0);
 	if (ans.n.nlmsg_type == NLMSG_ERROR ||