diff --git a/[refs] b/[refs]
index 5fa2a69659a4..05c3606b2083 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df12c6d5ec9b88fc45c672b77dac015327dd8497
+refs/heads/master: 0d326013763bd4610cb72d9e2fa7f8ff2f414995
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_context.c b/trunk/drivers/gpu/drm/i915/i915_gem_context.c
index 047f81c206b3..f775d861f052 100644
--- a/trunk/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/trunk/drivers/gpu/drm/i915/i915_gem_context.c
@@ -460,7 +460,7 @@ int i915_switch_context(struct intel_ring_buffer *ring,
 	} else {
 		to = i915_gem_context_get(file_priv, to_id);
 		if (to == NULL)
-			return -EINVAL;
+			return -ENOENT;
 	}
 
 	if (from_obj == to->obj)
@@ -526,7 +526,7 @@ int i915_gem_context_destroy_ioctl(struct drm_device *dev, void *data,
 	ctx = i915_gem_context_get(file_priv, args->ctx_id);
 	if (!ctx) {
 		mutex_unlock(&dev->struct_mutex);
-		return -EINVAL;
+		return -ENOENT;
 	}
 
 	do_destroy(ctx);