From 0066e0219c59babe7b6d1c79a25d2d0fe11a9c15 Mon Sep 17 00:00:00 2001
From: andrew hendry <andrew.hendry@gmail.com>
Date: Sun, 14 Feb 2010 02:00:11 +0000
Subject: [PATCH] --- yaml --- r: 184120 b: refs/heads/master c:
 b18e7a06857833d2c7c8c8457e5a3a7c3327f643 h: refs/heads/master v: v3

---
 [refs]                 |  2 +-
 trunk/net/x25/af_x25.c | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 099bd01c87a1..56e023228089 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf588477a3fbf085426e5c0b6205984ebb7e2187
+refs/heads/master: b18e7a06857833d2c7c8c8457e5a3a7c3327f643
diff --git a/trunk/net/x25/af_x25.c b/trunk/net/x25/af_x25.c
index e3219e4cd044..6c7104edec60 100644
--- a/trunk/net/x25/af_x25.c
+++ b/trunk/net/x25/af_x25.c
@@ -512,15 +512,20 @@ static int x25_create(struct net *net, struct socket *sock, int protocol,
 {
 	struct sock *sk;
 	struct x25_sock *x25;
-	int rc = -ESOCKTNOSUPPORT;
+	int rc = -EAFNOSUPPORT;
 
 	if (!net_eq(net, &init_net))
-		return -EAFNOSUPPORT;
+		goto out;
+
+	rc = -ESOCKTNOSUPPORT;
+	if (sock->type != SOCK_SEQPACKET)
+		goto out;
 
-	if (sock->type != SOCK_SEQPACKET || protocol)
+	rc = -EINVAL;
+	if (protocol)
 		goto out;
 
-	rc = -ENOMEM;
+	rc = -ENOBUFS;
 	if ((sk = x25_alloc_socket(net)) == NULL)
 		goto out;