diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 52941cb3a..fae933166 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -226,7 +226,7 @@ KdPointerProc(DeviceIntPtr pDevice, int onoff)
                 ErrorF("Couldn't find pointer driver %s\n",
                        pi->driverPrivate ? (char *) pi->driverPrivate :
                        "(unnamed)");
-                return !Success;
+                return BadRequest;
             }
             free(pi->driverPrivate);
             pi->driverPrivate = NULL;
@@ -238,7 +238,7 @@ KdPointerProc(DeviceIntPtr pDevice, int onoff)
         }
 
         if ((*pi->driver->Init) (pi) != Success) {
-            return !Success;
+            return BadRequest;
         }
 
         btn_labels = calloc(pi->nButtons, sizeof(Atom));
@@ -518,7 +518,7 @@ KdKeyboardProc(DeviceIntPtr pDevice, int onoff)
                 ErrorF("Couldn't find keyboard driver %s\n",
                        ki->driverPrivate ? (char *) ki->driverPrivate :
                        "(unnamed)");
-                return !Success;
+                return BadRequest;
             }
             free(ki->driverPrivate);
             ki->driverPrivate = NULL;
@@ -542,7 +542,7 @@ KdKeyboardProc(DeviceIntPtr pDevice, int onoff)
         }
 
         if ((*ki->driver->Init) (ki) != Success) {
-            return !Success;
+            return BadRequest;
         }
 
         xiclass = AtomFromName(XI_KEYBOARD);
@@ -721,13 +721,13 @@ KdAddKeyboard(KdKeyboardInfo * ki)
     KdKeyboardInfo **prev;
 
     if (!ki)
-        return !Success;
+        return BadRequest;
 
     ki->dixdev = AddInputDevice(serverClient, KdKeyboardProc, TRUE);
     if (!ki->dixdev) {
         ErrorF("Couldn't register keyboard device %s\n",
                ki->name ? ki->name : "(unnamed)");
-        return !Success;
+        return BadRequest;
     }
 
 #ifdef DEBUG