summaryrefslogtreecommitdiff
path: root/net/core
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-06-20 01:12:15 (GMT)
committerDavid S. Miller <davem@davemloft.net>2014-06-20 01:12:15 (GMT)
commit8e4946ccdc09e0f04d2cb21f01886bd33de8532b (patch)
tree3776e7ec622d827bbe33ebe87a17c5d2dd18fcd5 /net/core
parent6f9a093b66ce7cacc110d8737c03686e80ecfda6 (diff)
downloadlinux-8e4946ccdc09e0f04d2cb21f01886bd33de8532b.tar.xz
Revert "net: return actual error on register_queue_kobjects"
This reverts commit d36a4f4b472334562b8e7252e35d3d770db83815. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/net-sysfs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 5c1c1e5..1cac29e 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;