diff options
| author | Nick Hibma <n_hibma@FreeBSD.org> | 1999-05-03 23:16:05 +0000 |
|---|---|---|
| committer | Nick Hibma <n_hibma@FreeBSD.org> | 1999-05-03 23:16:05 +0000 |
| commit | f99abb25a657c9aee27c3cfc5aa573cc8ad46077 (patch) | |
| tree | 757b2d45014e7ae3d8d5d67de385be8475a284d4 /sys | |
| parent | 6fed05b974ec9670be17cc4206c73b58ff39d2e4 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/ukbd.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c index 82721c582c5f..33a7d0542231 100644 --- a/sys/dev/usb/ukbd.c +++ b/sys/dev/usb/ukbd.c @@ -217,7 +217,6 @@ int ukbd_detach(device_t self) { struct ukbd_softc *sc = device_get_softc(self); - const char *devinfo = device_get_desc(self); int error; error = ukbd_remove_kbd(sc); @@ -228,10 +227,7 @@ ukbd_detach(device_t self) DPRINTF(("%s: disconnected\n", USBDEVNAME(self))); - if (devinfo) { - device_set_desc(self, NULL); - free((void *)devinfo, M_USB); - } + device_set_desc(self, NULL); return (0); } @@ -865,7 +861,7 @@ ukbd_interrupt(keyboard_t *kbd, void *arg) if (state->ks_inputs <= 0) return 0; -#if UKBD_DEBUG +#ifdef UKBD_DEBUG for (i = state->ks_inputhead, j = 0; j < state->ks_inputs; ++j, i = (i + 1)%INPUTBUFSIZE) { c = state->ks_input[i]; @@ -1425,7 +1421,7 @@ probe_keyboard(struct usb_attach_arg *uaa, int flags) { usb_interface_descriptor_t *id; - if (!uaa->iface) + if (!uaa->iface) /* we attach to ifaces only */ return EINVAL; /* Check that this is a keyboard that speaks the boot protocol. */ @@ -1434,7 +1430,8 @@ probe_keyboard(struct usb_attach_arg *uaa, int flags) && id->bInterfaceClass == UCLASS_HID && id->bInterfaceSubClass == USUBCLASS_BOOT && id->bInterfaceProtocol == UPROTO_BOOT_KEYBOARD) - return 0; + return 0; /* found it */ + return EINVAL; } |