Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 92ffd11a7195..dfc1054e4cbd 100644
--- a/drivers/net/tun.c
+++ b/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);