Module Name: xsrc
Committed By: mbalmer
Date: Tue Dec 8 09:55:38 UTC 2009
Modified Files:
xsrc/external/mit/xf86-input-ws/dist/src: ws.c
Log Message:
Remove the input driver before returning NULL on error in PreInit().
>From OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/xf86-input-ws/dist/src/ws.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-input-ws/dist/src/ws.c
diff -u xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.1.1.1 xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.2
--- xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.1.1.1 Fri Nov 27 14:17:19 2009
+++ xsrc/external/mit/xf86-input-ws/dist/src/ws.c Tue Dec 8 09:55:38 2009
@@ -340,10 +340,13 @@
pInfo->flags |= XI86_CONFIGURED;
return pInfo;
fail:
- if (priv != NULL)
+ if (priv != NULL) {
xfree(priv);
- if (pInfo != NULL)
- xfree(pInfo);
+ pInfo->private = NULL;
+ }
+ if (pInfo != NULL) {
+ xf86DeleteInput(pInfo, 0);
+ }
return NULL;
}
