diff options
| author | Thomas Hellstrom <thellstrom@vmware.com> | 2012-01-12 17:57:37 +0100 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom@vmware.com> | 2012-01-13 16:58:16 +0100 |
| commit | 59435d2d3af8a9f64ee40eac4f0479470ba6badf (patch) | |
| tree | 6397bd6ae7d172b45851441b89be75aa16d1eb3b /vmwgfx/vmwgfx_driver.c | |
| parent | 0628ad20f31a239f99fcbbfe42197c56a5ae8864 (diff) | |
vmwgfx,saa: Fix a bunch of compilation warnings
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Diffstat (limited to 'vmwgfx/vmwgfx_driver.c')
| -rw-r--r-- | vmwgfx/vmwgfx_driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |