summaryrefslogtreecommitdiff
path: root/net/netlink/af_netlink.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-10-14 01:50:31 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-10-14 01:50:31 +0300
commit69f658e399f3d9cb9c9680afb714ba23860d7ccb (patch)
tree13fbc42f466cb10d319514e4ddec53def8c554f6 /net/netlink/af_netlink.c
parent9867999f3a85b52f96ef05fca00cc8128eed01ce (diff)
parent42f6284ae602469762ee721ec31ddfc6170e00bc (diff)
downloadlinux-69f658e399f3d9cb9c9680afb714ba23860d7ccb.tar.xz
Merge branch 'pm-domains' into pm-opp
Diffstat (limited to 'net/netlink/af_netlink.c')
-rw-r--r--net/netlink/af_netlink.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 327807731b44..94c11cf0459d 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -2270,10 +2270,13 @@ int __netlink_dump_start(struct sock *ssk, struct sk_buff *skb,
mutex_unlock(nlk->cb_mutex);
+ ret = 0;
if (cb->start)
- cb->start(cb);
+ ret = cb->start(cb);
+
+ if (!ret)
+ ret = netlink_dump(sk);
- ret = netlink_dump(sk);
sock_put(sk);
if (ret)