From 843146cfbaef234e13df9a62b6f0232a5efdf7f0 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Fri, 7 Apr 2006 15:53:21 +0000
Subject: [PATCH] Coverity #1216: Fix double-close of file on error.

---
 ChangeLog                               | 5 +++++
 hw/xfree86/utils/xorgcfg/keyboard-cfg.c | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 8865609ee..adb25286f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-07  Daniel Stone  <daniel@freedesktop.org>
+
+	* hw/xfree86/utils/xorgcfg/keyboard-cfg.c:
+	Coverity #1216: Fix double-close of file on error.
+
 2006-04-06  Keith Packard  <keithp@keithp.com>
 
 	* fb/fbstipple.c: (fbEvenStipple):
diff --git a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c
index 334070d4e..05b1aeb09 100644
--- a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c
+++ b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c
@@ -1013,7 +1013,6 @@ KeyboardRulesCallback(Widget w, XtPointer user_data, XtPointer call_data)
 	}
 
 	if (!XkbRF_LoadRules(fp, xkb_rules->list)) {
-	    fclose(fp);
 	    fprintf(stderr, "Can't load rules\n");
 	}
 	fclose(fp);