diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-10-08 10:40:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-10-08 10:40:34 +0200 |
| commit | edfbeecd92b0c4a648ed96a7e255bfc9a1bc4642 (patch) | |
| tree | efdfc57e2520886842a27f2c9978c83d968ba709 /net/core/devlink.c | |
| parent | x86/asm: Use CC_SET()/CC_OUT() in __cmpxchg_double() (diff) | |
| parent | Merge tag 'char-misc-4.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | linux-edfbeecd92b0c4a648ed96a7e255bfc9a1bc4642.tar.gz linux-edfbeecd92b0c4a648ed96a7e255bfc9a1bc4642.zip | |
Merge branch 'linus' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/core/devlink.c')
| -rw-r--r-- | net/core/devlink.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/devlink.c b/net/core/devlink.c index 65fc366a78a4..8c0ed225e280 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -2592,7 +2592,7 @@ send_done: if (!nlh) { err = devlink_dpipe_send_and_alloc_skb(&skb, info); if (err) - goto err_skb_send_alloc; + return err; goto send_done; } return genlmsg_reply(skb, info); @@ -2600,7 +2600,6 @@ send_done: nla_put_failure: err = -EMSGSIZE; err_resource_put: -err_skb_send_alloc: nlmsg_free(skb); return err; } |