diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-04-23 16:07:15 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-04-23 16:07:15 -0700 |
commit | 57eb13a9e8f5d45a95d64da2174528666240031d (patch) | |
tree | 71aa69d108c3050a132c1181cb9b4a9eb69ac04e /net/sched/act_simple.c | |
parent | 04bb1719c4de94700056241d4c0fe3c1413f5aff (diff) | |
parent | 96a938aa214e965d5b4a2f10443b29cad14289b9 (diff) |
Merge branch 'ib-chrome-platform-input-atmel-mx-ts-platform-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform into next
Sync up with chrome-platform to bring in changes to Atmel touch
controller.
Diffstat (limited to 'net/sched/act_simple.c')
-rw-r--r-- | net/sched/act_simple.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/act_simple.c b/net/sched/act_simple.c index 425eac11f6da..b1f38063ada0 100644 --- a/net/sched/act_simple.c +++ b/net/sched/act_simple.c @@ -121,7 +121,7 @@ static int tcf_simp_init(struct net *net, struct nlattr *nla, d = to_defact(*a); ret = alloc_defdata(d, defdata); if (ret < 0) { - tcf_idr_cleanup(*a, est); + tcf_idr_release(*a, bind); return ret; } d->tcf_action = parm->action; |