diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-07-18 14:59:06 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-07-18 14:59:17 +1000 |
| commit | 7246720a339199c7779385266c182ee6824aac1d (patch) | |
| tree | 2423429bce5e0da09d1d8c8a40fd5cb6367f53a8 | |
| parent | d2798e54d52102a6ee3841072f2054865347e131 (diff) | |
| download | xf86-input-wacom-7246720a339199c7779385266c182ee6824aac1d.tar.gz | |
Don't call xf86DeleteInput from PreInit if the device failed to initialize
Causes a double-free on pInfo when the server calls UnInit later.
Introduced in 2ceee5a0572c968eb36702589b8b9eec4b4c20ef by a bad merge
conflict resolve. The upstream patch has this part included.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/wcmConfig.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/wcmConfig.c b/src/wcmConfig.c index 217e342..70614fe 100644 --- a/src/wcmConfig.c +++ b/src/wcmConfig.c @@ -452,7 +452,6 @@ SetupProc_fail: } pInfo->private = NULL; - xf86DeleteInput(pInfo, 0); } return BadMatch; |