From 7737e8ab4dd20ac6ab083f4714eb291fa681de3b Mon Sep 17 00:00:00 2001
From: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Date: Sun, 5 Jul 2009 19:48:35 +0000
Subject: [PATCH] --- yaml --- r: 155018 b: refs/heads/master c:
 3c8a9c63d5fd738c261bd0ceece04d9c8357ca13 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a7d743270cd2..c3b73854920a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ded3f59f35a2642852b3e2a1c0fa8a97777e9af
+refs/heads/master: 3c8a9c63d5fd738c261bd0ceece04d9c8357ca13
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index b393536012fb..027f7aba26af 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -486,12 +486,14 @@ static unsigned int tun_chr_poll(struct file *file, poll_table * wait)
 {
 	struct tun_file *tfile = file->private_data;
 	struct tun_struct *tun = __tun_get(tfile);
-	struct sock *sk = tun->sk;
+	struct sock *sk;
 	unsigned int mask = 0;
 
 	if (!tun)
 		return POLLERR;
 
+	sk = tun->sk;
+
 	DBG(KERN_INFO "%s: tun_chr_poll\n", tun->dev->name);
 
 	poll_wait(file, &tun->socket.wait, wait);