diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-03-05 19:52:18 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-05 19:52:18 (GMT) |
| commit | 33ca8a53f262b4af40611bea331b8c87d133af72 (patch) | |
| tree | d6468c820a556c4915bcb5b761204a0fb19e8225 /net/can | |
| parent | db2dcb4f91d5fec5c346a82c309187ee821e2495 (diff) | |
| parent | 13a7a6ac0a11197edcd0f756a035f472b42cdf8b (diff) | |
| download | linux-33ca8a53f262b4af40611bea331b8c87d133af72.tar.xz | |
Merge tag 'v4.0-rc2' into irq/core, to refresh the tree before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/can')
| -rw-r--r-- | net/can/gw.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/can/gw.c b/net/can/gw.c index 295f62e..a6f448e 100644 --- a/net/can/gw.c +++ b/net/can/gw.c @@ -575,7 +575,8 @@ static int cgw_put_job(struct sk_buff *skb, struct cgw_job *gwj, int type, goto cancel; } - return nlmsg_end(skb, nlh); + nlmsg_end(skb, nlh); + return 0; cancel: nlmsg_cancel(skb, nlh); |