From 1bb197d67094fbd8825e292d22418cea84345526 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@gmail.com>
Date: Wed, 21 Jul 2010 10:29:32 +1000
Subject: [PATCH] --- yaml --- r: 201124 b: refs/heads/master c:
 c42750b0261274107ae85c894c088e618a3e38b9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2de5d7167dcb..76eb42f8bc25 100644
--- 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
index f4fb88ece2bb..ca5c29f70779 100644
--- 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;