---

yaml --- r: 201124 b: refs/heads/master c: c42750b h: refs/heads/master v: v3
git-mirror · Jul 21, 2010 · 1bb197d · 1bb197d
1 parent 87d0bef
commit 1bb197d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e153b70b89770968a704eda0b55707c6066b2d44
+refs/heads/master: c42750b0261274107ae85c894c088e618a3e38b9
diff --git a/trunk/drivers/gpu/drm/radeon/r600_blit.c b/trunk/drivers/gpu/drm/radeon/r600_blit.c
@@ -538,9 +538,12 @@ int
 r600_prepare_blit_copy(struct drm_device *dev, struct drm_file *file_priv)
 {
 	drm_radeon_private_t *dev_priv = dev->dev_private;
+	int ret;
 	DRM_DEBUG("\n");
 
-	r600_nomm_get_vb(dev);
+	ret = r600_nomm_get_vb(dev);
+	if (ret)
+		return ret;
 
 	dev_priv->blit_vb->file_priv = file_priv;