summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Paalanen <pekka.paalanen@collabora.co.uk>2017-09-13 11:58:00 +0300
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2017-09-25 12:07:38 +0300
commit82b8ddf9d9640b23237a1799b2912641082ad2d1 (patch)
tree3ab93af0e6ed105bf7fa39138876fe307d8539cd
parentffa42ffdaa006f73758cf3e9c6f9c80aff2ecbff (diff)
compositor-fbdev: MAP_FAILED is not NULL
Fix the assumption that MAP_FAILED would be equal to NULL. It is not. Set 'fb' explicitly to NULL on mmap failure so that comparisons to NULL would produce the expected result. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Daniel Stone <daniels@collabora.com>
-rw-r--r--libweston/compositor-fbdev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libweston/compositor-fbdev.c b/libweston/compositor-fbdev.c
index 6a305385..b1cc5dca 100644
--- a/libweston/compositor-fbdev.c
+++ b/libweston/compositor-fbdev.c
@@ -383,6 +383,7 @@ fbdev_frame_buffer_map(struct fbdev_output *output, int fd)
if (output->fb == MAP_FAILED) {
weston_log("Failed to mmap frame buffer: %s\n",
strerror(errno));
+ output->fb = NULL;
goto out_close;
}