summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorentin Chary <corentin.chary@gmail.com>2011-06-14 16:04:31 +0200
committerCorentin Chary <corentin.chary@gmail.com>2011-06-14 16:04:31 +0200
commitd90d1d92e3eef05024ae2fc79f588607186ad4d5 (patch)
treed5f8cf210f5d42b4df173e52337c98526c5f84a6
parent31244834b8f3faaa6604944a471fa91ebf4eda4b (diff)
wlshm: fix a crash when pre_init failed
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
-rw-r--r--src/wlshm.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/wlshm.c b/src/wlshm.c
index 9f9d1c2..34d59cf 100644
--- a/src/wlshm.c
+++ b/src/wlshm.c
@@ -185,9 +185,11 @@ wlshm_free_screen(int scrnIndex, int flags)
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
struct wlshm_device *wlshm = wlshm_scrninfo_priv(pScrn);
- if (wlshm->xwl_screen)
- xwl_screen_destroy(wlshm->xwl_screen);
- wlshm->xwl_screen = NULL;
+ if (wlshm) {
+ if (wlshm->xwl_screen)
+ xwl_screen_destroy(wlshm->xwl_screen);
+ wlshm->xwl_screen = NULL;
+ }
wlshm_free_device(pScrn);
}
@@ -195,7 +197,7 @@ wlshm_free_screen(int scrnIndex, int flags)
static ModeStatus
wlshm_valid_mode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{
- return(MODE_OK);
+ return MODE_OK;
}
static void