From 1fc925d744201b3b564c991a65c8cb3abd6c9274 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Mon, 12 May 2008 15:43:46 -0700
Subject: [PATCH] --- yaml --- r: 96541 b: refs/heads/master c:
 5dc474d6b3ba19df7d491d4eabd9fb7a0c1c2423 h: refs/heads/master i:   96539:
 d824e0e69267ab78c1953551578da2656a274880 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/net/pppol2tp.c | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0e648d70076b..0568519b6077 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4951704b4e23d71b99ac933d8e6993bc6225ac13
+refs/heads/master: 5dc474d6b3ba19df7d491d4eabd9fb7a0c1c2423
diff --git a/trunk/drivers/net/pppol2tp.c b/trunk/drivers/net/pppol2tp.c
index 244d7830c92a..79359919335b 100644
--- a/trunk/drivers/net/pppol2tp.c
+++ b/trunk/drivers/net/pppol2tp.c
@@ -1621,9 +1621,16 @@ static int pppol2tp_connect(struct socket *sock, struct sockaddr *uservaddr,
 end:
 	release_sock(sk);
 
-	if (error != 0)
-		PRINTK(session ? session->debug : -1, PPPOL2TP_MSG_CONTROL, KERN_WARNING,
-		       "%s: connect failed: %d\n", session->name, error);
+	if (error != 0) {
+		if (session)
+			PRINTK(session->debug,
+				PPPOL2TP_MSG_CONTROL, KERN_WARNING,
+				"%s: connect failed: %d\n",
+				session->name, error);
+		else
+			PRINTK(-1, PPPOL2TP_MSG_CONTROL, KERN_WARNING,
+				"connect failed: %d\n", error);
+	}
 
 	return error;
 }