]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
drm/r600: fix possible NULL pointer derefernce
authorAlex Deucher <alexdeucher@gmail.com>
Wed, 21 Jul 2010 00:29:32 +0000 (10:29 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 21 Jul 2010 00:29:32 +0000 (10:29 +1000)
Reported-by: Alexander Y. Fomichev <git.user@gmail.com>
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/r600_blit.c

index f4fb88ece2bbc0221e9a967518a94745fb545be6..ca5c29f707797425f8844c4f464c25a8ecb137cc 100644 (file)
@@ -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;