From 55cfd485a39c2402aca239d02facf82dd0cdace9 Mon Sep 17 00:00:00 2001
From: Li RongQing <roy.qing.li@gmail.com>
Date: Mon, 17 Sep 2012 22:40:10 +0000
Subject: [PATCH] --- yaml --- r: 323079 b: refs/heads/master c:
 433a19548061bb5457b6ab77ed7ea58ca6e43ddb h: refs/heads/master i:   323077:
 ac9094a7e582caa45a98becf43f9fe03db3941e0   323075:
 994f81a7e72cf510a63e3f50582c0dcba3bb50be   323071:
 a69bee5d9dd594819a860f1289d3906d15b1a148 v: v3

---
 [refs]                       | 2 +-
 trunk/net/xfrm/xfrm_policy.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c804e4140ea4..06717d36b562 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d57f19539c074105791da6384a8ad674bba8037
+refs/heads/master: 433a19548061bb5457b6ab77ed7ea58ca6e43ddb
diff --git a/trunk/net/xfrm/xfrm_policy.c b/trunk/net/xfrm/xfrm_policy.c
index ab2ce7d5152d..387848e90078 100644
--- a/trunk/net/xfrm/xfrm_policy.c
+++ b/trunk/net/xfrm/xfrm_policy.c
@@ -1764,7 +1764,7 @@ static struct dst_entry *make_blackhole(struct net *net, u16 family,
 
 	if (!afinfo) {
 		dst_release(dst_orig);
-		ret = ERR_PTR(-EINVAL);
+		return ERR_PTR(-EINVAL);
 	} else {
 		ret = afinfo->blackhole_route(net, dst_orig);
 	}