From: YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>
Date: Tue, 22 Jan 2013 06:32:44 +0000 (+0000)
Subject: net: Use IS_ERR_OR_NULL().
X-Git-Tag: v3.9-rc1~139^2~292
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8fbcec241df21d1ba2aba09974ea9017832b69b0;p=thirdparty%2Flinux.git

net: Use IS_ERR_OR_NULL().

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/flow.c b/net/core/flow.c
index b0901ee5a0025..43f7495df27a9 100644
--- a/net/core/flow.c
+++ b/net/core/flow.c
@@ -286,7 +286,7 @@ nocache:
 		else
 			fle->genid--;
 	} else {
-		if (flo && !IS_ERR(flo))
+		if (!IS_ERR_OR_NULL(flo))
 			flo->ops->delete(flo);
 	}
 ret_object: