From patchwork Fri Nov 14 18:32:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 410971 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2D87714009B for ; Sat, 15 Nov 2014 05:33:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161727AbaKNSdI (ORCPT ); Fri, 14 Nov 2014 13:33:08 -0500 Received: from mailrelay009.isp.belgacom.be ([195.238.6.176]:25543 "EHLO mailrelay009.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161422AbaKNSdG (ORCPT ); Fri, 14 Nov 2014 13:33:06 -0500 X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Aq4SALtJZlRXQzQ2/2dsb2JhbABbgw6BLrlDBQF1mg8EAoEdFwEBAQEBfYRfI4EaN4hFAcFxkCcshj6KZB2ENQWeTI0SiWiBRwGCNTwwgksBAQE Received: from 54.52-67-87.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([87.67.52.54]) by relay.skynet.be with ESMTP; 14 Nov 2014 19:33:03 +0100 From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: Fabian Frederick , Pravin Shelar , "David S. Miller" , dev@openvswitch.org, netdev@vger.kernel.org Subject: [PATCH 1/1 net-next] openvswitch: use PTR_ERR_OR_ZERO Date: Fri, 14 Nov 2014 19:32:58 +0100 Message-Id: <1415989978-28559-1-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 1.9.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Fabian Frederick Acked-by: Pravin B Shelar --- net/openvswitch/flow_netlink.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/openvswitch/flow_netlink.c b/net/openvswitch/flow_netlink.c index c0d066d..c8fccdd 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, struct nlattr *a; a = __add_action(sfa, attrtype, data, len, log); - if (IS_ERR(a)) - return PTR_ERR(a); - return 0; + return PTR_ERR_OR_ZERO(a); } static inline int add_nested_action_start(struct sw_flow_actions **sfa,