[PATCH xserver] xfree86: fix unbalanced input_lock/unlock in xf86NewInputDevice()

Peter Hutterer peter.hutterer at who-t.net
Fri Aug 12 03:31:15 UTC 2016


If a device couldn't be enabled we left the lock hanging.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 hw/xfree86/common/xf86Xinput.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 42d0f32..054eb3e 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -961,6 +961,7 @@ xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable)
             xf86Msg(X_ERROR, "Couldn't init device \"%s\"\n", pInfo->name);
             RemoveDevice(dev, TRUE);
             rval = BadMatch;
+            input_unlock();
             goto unwind;
         }
         /* send enter/leave event, update sprite window */
-- 
2.7.4



More information about the xorg-devel mailing list