path: root/drivers/gpu/drm/radeon/r600_blit.c
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-20 18:29:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-20 18:29:25 -0700
commitf4b23cc2d5dc78ef5acbc529eb1219cc41eb5b96 (patch)
treecadf0fd7e2bcb2d2d2402fcddbda3ec9b53b2c0c /drivers/gpu/drm/radeon/r600_blit.c
parente0959371b4aaddb9b986019d5cfef93f9801d0ff (diff)
parentc42750b0261274107ae85c894c088e618a3e38b9 (diff)
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/r600: fix possible NULL pointer derefernce drm/radeon/kms: add quirk for ASUS HD 3600 board include/linux/vgaarb.h: add missing part of include guard drm/nouveau: Fix crashes during fbcon init on single head cards. drm/nouveau: fix pcirom vbios shadow breakage from acpi rom patch drm/radeon/kms: fix shared ddc harder drm/i915: enable low power render writes on GEN3 hardware. drm/i915: Define MI_ARB_STATE bits vmwgfx: return -EFAULT if copy_to_user fails fb: handle allocation failure in alloc_apertures() drm: radeon: check kzalloc() result drm/ttm: Fix build on architectures without AGP drm/radeon/kms: fix gtt MC base alignment on rs4xx/rs690/rs740 asics drm/radeon/kms: fix possible mis-detection of sideport on rs690/rs740 drm/radeon/kms: fix legacy tv-out pal mode
Diffstat (limited to 'drivers/gpu/drm/radeon/r600_blit.c')
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r600_blit.c b/drivers/gpu/drm/radeon/r600_blit.c
index f4fb88ece2b..ca5c29f7077 100644
--- a/drivers/gpu/drm/radeon/r600_blit.c
+++ b/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;
- r600_nomm_get_vb(dev);
+ ret = r600_nomm_get_vb(dev);
+ if (ret)
+ return ret;
dev_priv->blit_vb->file_priv = file_priv;