From 312ab580c61dbebf6d812b5a8f6a657a548535ab Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Thu, 22 Nov 2007 18:46:54 +1000
Subject: [PATCH] --- yaml --- r: 84030 b: refs/heads/master c:
 b018fcdaa5e8b4eabb8cffda687d00004a3c4785 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/char/drm/drm_ioctl.c | 25 +++++++++++--------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 41c62312cf73..cd18dd1030fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3260f9fdfee9d5b4135f40943dc0bd0733b7394e
+refs/heads/master: b018fcdaa5e8b4eabb8cffda687d00004a3c4785
diff --git a/trunk/drivers/char/drm/drm_ioctl.c b/trunk/drivers/char/drm/drm_ioctl.c
index b4d86a3343c6..16829fb3089d 100644
--- a/trunk/drivers/char/drm/drm_ioctl.c
+++ b/trunk/drivers/char/drm/drm_ioctl.c
@@ -235,25 +235,22 @@ int drm_getclient(struct drm_device *dev, void *data,
 	idx = client->idx;
 	mutex_lock(&dev->struct_mutex);
 
-	if (list_empty(&dev->filelist)) {
-		mutex_unlock(&dev->struct_mutex);
-		return -EINVAL;
-	}
-
 	i = 0;
 	list_for_each_entry(pt, &dev->filelist, lhead) {
-		if (i++ >= idx)
-			break;
+		if (i++ >= idx) {
+			client->auth = pt->authenticated;
+			client->pid = pt->pid;
+			client->uid = pt->uid;
+			client->magic = pt->magic;
+			client->iocs = pt->ioctl_count;
+			mutex_unlock(&dev->struct_mutex);
+
+			return 0;
+		}
 	}
-
-	client->auth = pt->authenticated;
-	client->pid = pt->pid;
-	client->uid = pt->uid;
-	client->magic = pt->magic;
-	client->iocs = pt->ioctl_count;
 	mutex_unlock(&dev->struct_mutex);
 
-	return 0;
+	return -EINVAL;
 }
 
 /**