diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-10-04 11:03:34 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-10-04 11:03:34 +1000 |
| commit | 6004f172b375f5747e89afc62ad3baaf1bebd58a (patch) | |
| tree | 914fafcc0e373c45c6e0dcc3661dad3a8be5f3d1 /net/core/devlink.c | |
| parent | 612c6bd5e3f8b67505316805dc15369598f6ff57 (diff) | |
| parent | 17b57b1883c1285f3d0dc2266e8f79286a7bef38 (diff) | |
BackMerge v4.19-rc6 into drm-next
I have some pulls based on rc6, and I prefer to have an explicit backmerge.
Signed-off-by: Dave Airlie <airlied@redhat.com>
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; } |