From c9395d58168334efbfd3ed1366a8e556156773e5 Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Tue, 20 Jan 2009 10:59:05 +0000
Subject: [PATCH] --- yaml --- r: 133878 b: refs/heads/master c:
 eac9e902658dab1e097b8ef064e9e3d16c152cc9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ea8c2da452aa..1af0f8b7ace2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7385ba21102a90f902055f9f185ca02bf62fa43
+refs/heads/master: eac9e902658dab1e097b8ef064e9e3d16c152cc9
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index 20ef14dc5603..8743de9d2572 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -382,7 +382,7 @@ static unsigned int tun_chr_poll(struct file *file, poll_table * wait)
 	unsigned int mask = POLLOUT | POLLWRNORM;
 
 	if (!tun)
-		return -EBADFD;
+		return POLLERR;
 
 	DBG(KERN_INFO "%s: tun_chr_poll\n", tun->dev->name);