xserver: Branch 'master'

[Keith Packard]

 hw/kdrive/ephyr/ephyr.c |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 899451ae595f5f51a500295c624bf7ad14aca602
Author: Keith Packard <keithp at keithp.com>
Date:   Wed Oct 30 08:54:24 2013 -0700

    kdrive/ephyr: Don't discard one-time driver structure at server reset
    
    KdScreenInfo is constructed at server startup time, and not
    re-generated at server reset time. Freeing the 'driver' element at
    reset time means this information is lost, and the server crashes
    pretty quickly afterwards.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index a603ef7..91e949d 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -732,8 +732,6 @@ ephyrScreenFini(KdScreenInfo * screen)
     if (scrpriv->shadow) {
         KdShadowFbFree(screen);
     }
-    free(screen->driver);
-    screen->driver = NULL;
 }
 
 /*