summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@arm.linux.org.uk>2014-08-26 15:12:56 +0100
committerRussell King <rmk@arm.linux.org.uk>2014-08-26 21:01:38 +0100
commit6b1d1cfbcd6aa3396f11366ad60d54824e4a09ab (patch)
treee10350185d175eecbc200dc743c08381f5efd487
parent274da7a0d0aea95230d07914588eece9e9739166 (diff)
downloadxf86-video-armada-6b1d1cfbcd6aa3396f11366ad60d54824e4a09ab.tar.gz
vivante: fix buggy error path when mapping non-shmem bos
We were freeing the vivante_pixmap structure, but were then going on to store a pointer to it - this is not what was intended. Ensure that we mark the pixmap as being without a vivante_pixmap structure. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
-rw-r--r--src/vivante.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/vivante.c b/src/vivante.c
index f68e2c8..8823896 100644
--- a/src/vivante.c
+++ b/src/vivante.c
@@ -125,6 +125,7 @@ void vivante_set_pixmap_bo(PixmapPtr pixmap, struct drm_armada_bo *bo)
if (!vivante_map_bo_to_gpu(vivante, bo, &vPix->info,
&vPix->handle)) {
free(vPix);
+ vPix = NULL;
goto fail;
}
}