xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/fbdevhw/fbdevhw.c |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 2dc5ba4a1b127e3ed286718ab0a6c20438361192
Author: Matt Turner <mattst88 at gmail.com>
Date:   Tue Nov 29 23:52:19 2011 -0500

    Remove another if (E != NULL) check around free(E)
    
    I wonder if there are any other patterns we haven't seen yet?
    
    Reviewed-by: Jamey Sharp <jamey at minilop.net>
    Signed-off-by: Matt Turner <mattst88 at gmail.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
index d7b4d3c..2019741 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/hw/xfree86/fbdevhw/fbdevhw.c
@@ -98,8 +98,6 @@ fbdevHWFreeRec(ScrnInfoPtr pScrn)
 {
 	if (fbdevHWPrivateIndex < 0)
 		return;
-	if (FBDEVHWPTR(pScrn) == NULL)
-		return;
 	free(FBDEVHWPTR(pScrn));
 	FBDEVHWPTRLVAL(pScrn) = NULL;
 }