diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-06-27 09:10:42 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-07-01 08:46:28 +1000 |
| commit | 87d4f90bfcb509471ac9e7886e14a92b33223fd7 (patch) | |
| tree | c211c23e866f53f6862d7e468bf3df07229083d7 /hw/kdrive | |
| parent | e084ac30b37c36016bb0dbb1b79e60a7799aee02 (diff) | |
input: free the EQ allocated memory on shutdown (#38634)
mieqFini() already does the right thing, but it needs to be called by the
various DDXs and the XTest Extension.
X.Org Bug 38634 <http://bugs.freedesktop.org/show_bug.cgi?id=38634>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Acked-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'hw/kdrive')
| -rw-r--r-- | hw/kdrive/ephyr/ephyrinit.c | 1 | ||||
| -rw-r--r-- | hw/kdrive/fake/fakeinit.c | 1 | ||||
| -rw-r--r-- | hw/kdrive/fbdev/fbinit.c | 1 | ||||
| -rw-r--r-- | hw/kdrive/src/kdrive.h | 2 | ||||
| -rw-r--r-- | hw/kdrive/src/kinput.c | 6 |
5 files changed, 11 insertions, 0 deletions
diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c index 7d4cadb9f..b674bb8d0 100644 --- a/hw/kdrive/ephyr/ephyrinit.c +++ b/hw/kdrive/ephyr/ephyrinit.c @@ -97,6 +97,7 @@ InitInput (int argc, char **argv) void CloseInput (void) { + KdCloseInput(); } #ifdef DDXBEFORERESET diff --git a/hw/kdrive/fake/fakeinit.c b/hw/kdrive/fake/fakeinit.c index ba61959ef..e25093fbf 100644 --- a/hw/kdrive/fake/fakeinit.c +++ b/hw/kdrive/fake/fakeinit.c @@ -61,6 +61,7 @@ InitInput (int argc, char **argv) void CloseInput (void) { + KdCloseInput (); } #ifdef DDXBEFORERESET diff --git a/hw/kdrive/fbdev/fbinit.c b/hw/kdrive/fbdev/fbinit.c index 3b55ab162..1d66fce32 100644 --- a/hw/kdrive/fbdev/fbinit.c +++ b/hw/kdrive/fbdev/fbinit.c @@ -47,6 +47,7 @@ InitInput (int argc, char **argv) void CloseInput (void) { + KdCloseInput (); } void diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h index 847d89b48..9ac5a19d7 100644 --- a/hw/kdrive/src/kdrive.h +++ b/hw/kdrive/src/kdrive.h @@ -500,6 +500,8 @@ KdScreenInfoDispose (KdScreenInfo *si); /* kinput.c */ void KdInitInput(void); +void +KdCloseInput(void); void KdAddPointerDriver(KdPointerDriver *); diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index 7fa4a8f8a..c14dd8241 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -1305,6 +1305,12 @@ KdInitInput (void) mieqInit(); } +void +KdCloseInput (void) +{ + mieqFini(); +} + /* * Middle button emulation state machine * |