diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2012-04-09 19:36:04 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2012-04-09 19:36:38 -0700 |
| commit | ad89533327919223204021738dd108d7dd814e8c (patch) | |
| tree | 21bd44ef60fe26acdae00d351b66f122a60a36a9 | |
| parent | 259aa5a69b69aa72be3fb7402b68560f9a6b05d6 (diff) | |
Revert "xfree86: workaround crash on close"
This reverts commit b704d9146336c3044be2be7ae38ce2c5b5a47f86.
This was causing some regressions. Reverting as discussed on xorg-devel.
| -rw-r--r-- | hw/xfree86/modes/xf86Rotate.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c index f9602fa47..85d75573d 100644 --- a/hw/xfree86/modes/xf86Rotate.c +++ b/hw/xfree86/modes/xf86Rotate.c @@ -272,7 +272,6 @@ xf86RotateDestroy(xf86CrtcPtr crtc) ScrnInfoPtr pScrn = crtc->scrn; ScreenPtr pScreen = pScrn->pScreen; xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); - DrawablePtr screenDrawable = &pScreen->root->drawable; int c; /* Free memory from rotation */ @@ -290,7 +289,7 @@ xf86RotateDestroy(xf86CrtcPtr crtc) /* * Clean up damage structures when no crtcs are rotated */ - if (screenDrawable && xf86_config->rotation_damage) { + if (xf86_config->rotation_damage) { /* Free damage structure */ if (xf86_config->rotation_damage_registered) { DamageUnregister(&pScreen->root->drawable, |