---

yaml --- r: 329266 b: refs/heads/master c: ab3951e h: refs/heads/master v: v3
git-mirror · Jul 26, 2012 · 223aff3 · 223aff3
1 parent b5be479
commit 223aff3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acbe9475505de68540fab8653131d41d424c4fa3
+refs/heads/master: ab3951eb74e7c33a2f5b7b64d72e82f1eea61571
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -6317,7 +6317,7 @@ static int intel_gen7_queue_flip(struct drm_device *dev,
 	default:
 		WARN_ONCE(1, "unknown plane in flip command\n");
 		ret = -ENODEV;
-		goto err;
+		goto err_unpin;
 	}
 
 	ret = intel_ring_begin(ring, 4);