summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/core/netlink.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2011-10-27 06:46:20 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-10-27 06:46:20 +0200
commit6ad390a25a9d1d8606b9b826878f0a30639dc2b3 (patch)
tree05aff14f02776bc0d59a1f777cb92df6f4456ba9 /drivers/infiniband/core/netlink.c
parentInput: wacom - revert "Cintiq 21UX2 does not have menu strips" (diff)
parentInput: adp5589-keys - add support for the ADP5585 derivatives (diff)
downloadlinux-6ad390a25a9d1d8606b9b826878f0a30639dc2b3.tar.xz
linux-6ad390a25a9d1d8606b9b826878f0a30639dc2b3.zip
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/infiniband/core/netlink.c')
-rw-r--r--drivers/infiniband/core/netlink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/core/netlink.c b/drivers/infiniband/core/netlink.c
index 4a5abaf0a25c..9227f4acd79c 100644
--- a/drivers/infiniband/core/netlink.c
+++ b/drivers/infiniband/core/netlink.c
@@ -148,7 +148,7 @@ static int ibnl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
return -EINVAL;
return netlink_dump_start(nls, skb, nlh,
client->cb_table[op].dump,
- NULL);
+ NULL, 0);
}
}