summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-07-19 11:42:12 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-07-19 11:42:12 +1000
commit4b47b4a9cdce3bd0368aacb8164aa02e05670a88 (patch)
treeb7c1d07bf986397964819ec8844049d24618e796
parent508d8793e5998fcac42a9dfd6f02235c3d82ab11 (diff)
Don't free anything on PreInit failure, let UnInit take care of it
Avoid double free's by the server when it calls UnInit. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/xf86Fpit.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c
index 78b44a2..2da34aa 100644
--- a/src/xf86Fpit.c
+++ b/src/xf86Fpit.c
@@ -567,12 +567,6 @@ static int xf86FpitInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
str = xf86FindOptionValue(pInfo->options, "Device");
if (!str) {
xf86Msg(X_ERROR, "%s: No Device specified in FPIT module config.\n", pInfo->name);
- if (priv) {
- if (priv->fpitDev) {
- free(priv->fpitDev);
- }
- free(priv);
- }
return BadValue;
}
priv->fpitDev = strdup(str);