From 10cd6fdc431d2d0835c313b2f5bdda6dcea281fd Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 8 Apr 2012 00:16:54 -0700 Subject: [PATCH] Revert "xfree86: workaround crash on close" This reverts commit 55f552adb651715d2620db7248cd5b9b8187654a. This appears to cause a crash at init time instead of close. Reported-by: Knut Petersen Acked-by: Jeremy Huddleston Signed-off-by: Keith Packard --- hw/xfree86/modes/xf86Rotate.c | 3 +-- 1 file changed, 1 insertion(+), 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,