From 0a076b6a7f3c97ff712412eee32e013d3bfd7364 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri, 31 Oct 2008 18:32:26 +1030
Subject: [PATCH] xkb: remove unused label "out", clean up program flow.

---
 xkb/xkbUtils.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 7e9f8d0e8..61d37af24 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -81,12 +81,10 @@ _XkbLookupAnyDevice(DeviceIntPtr *pDev, int id, ClientPtr client,
 
     if (id == XkbUseCoreKbd) {
         id = PickKeyboard(client)->id;
-    }
-    if (id == XkbUseCorePtr) {
+    } else if (id == XkbUseCorePtr) {
         id = PickPointer(client)->id;
     }
     rc = dixLookupDevice(pDev, id, client, access_mode);
-out:
     if (rc != Success)
 	*xkb_err = XkbErr_BadDevice;
     return rc;