From 0cf9b03f4990f61640dc35dfac250f929b57b4ed Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 14 Jun 2010 12:29:39 +0000
Subject: xserver git update 14/6/2010

---
 xorg-server/hw/xfree86/os-support/bus/Sbus.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'xorg-server/hw/xfree86/os-support')

diff --git a/xorg-server/hw/xfree86/os-support/bus/Sbus.c b/xorg-server/hw/xfree86/os-support/bus/Sbus.c
index 4560ef016..7c4888126 100644
--- a/xorg-server/hw/xfree86/os-support/bus/Sbus.c
+++ b/xorg-server/hw/xfree86/os-support/bus/Sbus.c
@@ -191,10 +191,8 @@ sparcPromClose(void)
 	close(promFd);
 	promFd = -1;
     }
-    if (promOpio) {
-	free(promOpio);
-	promOpio = NULL;
-    }
+    free(promOpio);
+    promOpio = NULL;
     promOpenCount = 0;
 }
 
-- 
cgit v1.2.3