From: David S. Miller <davem@davemloft.net>
Date: Fri, 20 Jun 2014 01:12:15 +0000 (-0700)
Subject: Revert "net: return actual error on register_queue_kobjects"
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8e4946ccdc09e0f04d2cb21f01886bd33de8532b;p=deliverable%2Flinux.git

Revert "net: return actual error on register_queue_kobjects"

This reverts commit d36a4f4b472334562b8e7252e35d3d770db83815.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 5c1c1e526a2b..1cac29ebb05b 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -1200,8 +1200,8 @@ static int register_queue_kobjects(struct net_device *net)
 #ifdef CONFIG_SYSFS
 	net->queues_kset = kset_create_and_add("queues",
 	    NULL, &net->dev.kobj);
-	if (IS_ERR(net->queues_kset))
-		return PTR_ERR(net->queues_kset);
+	if (!net->queues_kset)
+		return -ENOMEM;
 	real_rx = net->real_num_rx_queues;
 #endif
 	real_tx = net->real_num_tx_queues;