From 9ba2c4f7a234b46c142d8adbeacc0f53c153e2f6 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jeff@garzik.org>
Date: Tue, 3 Oct 2006 01:13:52 -0700
Subject: [PATCH] --- yaml --- r: 38005 b: refs/heads/master c:
 c3b6571384024be31e8b3442c0e7c3b127110d9b h: refs/heads/master i:   38003:
 2d47857478cea421fd1df6c5b92cbad30ed4de60 v: v3

---
 [refs]               | 2 +-
 trunk/fs/eventpoll.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3439dff29d94..ad0b0de35b71 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1ca66d1b990b23e7753c729332c0ada61f4f38d
+refs/heads/master: c3b6571384024be31e8b3442c0e7c3b127110d9b
diff --git a/trunk/fs/eventpoll.c b/trunk/fs/eventpoll.c
index 8d544334bcd2..557d5b614fae 100644
--- a/trunk/fs/eventpoll.c
+++ b/trunk/fs/eventpoll.c
@@ -720,9 +720,10 @@ static int ep_getfd(int *efd, struct inode **einode, struct file **efile,
 
 	/* Allocates an inode from the eventpoll file system */
 	inode = ep_eventpoll_inode();
-	error = PTR_ERR(inode);
-	if (IS_ERR(inode))
+	if (IS_ERR(inode)) {
+		error = PTR_ERR(inode);
 		goto eexit_2;
+	}
 
 	/* Allocates a free descriptor to plug the file onto */
 	error = get_unused_fd();