aboutsummaryrefslogtreecommitdiffstats
path: root/net/openvswitch
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-11-14 13:32:58 -0500
committerDavid S. Miller <davem@davemloft.net>2014-11-16 14:41:39 -0500
commitf35423c137b0e64155f52c166db1d13834a551f2 (patch)
treea102dfee6ee0e88ab4932d73aac8411499ff1afb /net/openvswitch
parent0372bf5c096217447157d41c3eee1fab1bac6c7e (diff)
openvswitch: use PTR_ERR_OR_ZERO
Signed-off-by: Fabian Frederick <fabf@skynet.be> Acked-by: Pravin B Shelar <pshelar@nicira.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch')
-rw-r--r--net/openvswitch/flow_netlink.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c
index c0d066def228..c8fccdded865 100644
--- a/net/openvswitch/flow_netlink.c
+++ b/net/openvswitch/flow_netlink.c
@@ -1425,10 +1425,8 @@ static int add_action(struct sw_flow_actions **sfa, int attrtype,
1425 struct nlattr *a; 1425 struct nlattr *a;
1426 1426
1427 a = __add_action(sfa, attrtype, data, len, log); 1427 a = __add_action(sfa, attrtype, data, len, log);
1428 if (IS_ERR(a))
1429 return PTR_ERR(a);
1430 1428
1431 return 0; 1429 return PTR_ERR_OR_ZERO(a);
1432} 1430}
1433 1431
1434static inline int add_nested_action_start(struct sw_flow_actions **sfa, 1432static inline int add_nested_action_start(struct sw_flow_actions **sfa,