From 59435d2d3af8a9f64ee40eac4f0479470ba6badf Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom Date: Thu, 12 Jan 2012 17:57:37 +0100 Subject: vmwgfx,saa: Fix a bunch of compilation warnings Signed-off-by: Thomas Hellstrom Reviewed-by: Jakob Bornecrantz --- vmwgfx/vmwgfx_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'vmwgfx/vmwgfx_driver.c') diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c index dcb6c83..e9e0c09 100644 --- a/vmwgfx/vmwgfx_driver.c +++ b/vmwgfx/vmwgfx_driver.c @@ -335,7 +335,6 @@ vmwgfx_set_topology(ScrnInfoPtr pScrn, const char *topology, const char *info) static Bool drv_pre_init(ScrnInfoPtr pScrn, int flags) { - xf86CrtcConfigPtr xf86_config; modesettingPtr ms; rgb defaultWeight = { 0, 0, 0 }; EntityInfoPtr pEnt; @@ -471,7 +470,6 @@ drv_pre_init(ScrnInfoPtr pScrn, int flags) /* Allocate an xf86CrtcConfig */ xf86CrtcConfigInit(pScrn, &crtc_config_funcs); - xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); /* get max width and height */ { @@ -732,6 +730,8 @@ drv_create_screen_resources(ScreenPtr pScreen) vmwgfx_swap(ms, pScreen, CreateScreenResources); ret = pScreen->CreateScreenResources(pScreen); vmwgfx_swap(ms, pScreen, CreateScreenResources); + if (!ret) + return ret; drv_adjust_frame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0); -- cgit v1.2.3