From 54b50e2de2c07565c40c8543f877a8212c4f0f90 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu, 28 Oct 2010 22:35:07 +0100
Subject: [PATCH] --- yaml --- r: 228664 b: refs/heads/master c:
 bbe2e11a4b683ead070ad5823cdf756e1525b903 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/i915_gem.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b64692a559ac..d0c49c542a9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a684a4117abd756291969336af454e8a958802f
+refs/heads/master: bbe2e11a4b683ead070ad5823cdf756e1525b903
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
index d4d8f888db85..7569b77fb403 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -4994,7 +4994,7 @@ i915_gem_inactive_shrink(struct shrinker *shrinker,
 	int cnt;
 
 	if (!mutex_trylock(&dev->struct_mutex))
-		return nr_to_scan ? 0 : -1;
+		return 0;
 
 	/* "fast-path" to count number of available objects */
 	if (nr_to_scan == 0) {