From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu, 28 Oct 2010 21:35:07 +0000 (+0100)
Subject: drm/i915: Do not return -1 from shrinker when nr_to_scan == 0
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=bbe2e11a4b683ead070ad5823cdf756e1525b903;p=linux-edison.git

drm/i915: Do not return -1 from shrinker when nr_to_scan == 0

The error code is only expected during the actual pruning and not during
the first measurement (nr_to_scan == 0) pass.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index d4d8f888db8..7569b77fb40 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/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) {