From 5b04cf397f2c9303ff6aaedeb8e44c527c3e8c07 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Sat, 25 Dec 2021 13:17:48 +0000 Subject: [PATCH] ukbd(4): Wait for callouts and blinking to complete in detach. This detach routine (and whole driver) has got a lotta other problems, but let's fix 'em one at a time... --- sys/dev/usb/ukbd.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c index 32016b8ceee4..90db0bccf05d 100644 --- a/sys/dev/usb/ukbd.c +++ b/sys/dev/usb/ukbd.c @@ -572,6 +572,10 @@ ukbd_detach(device_t self, int flags) if (sc->sc_wskbddev != NULL) rv = config_detach(sc->sc_wskbddev, flags); + callout_halt(&sc->sc_delay, NULL); + usb_rem_task_wait(sc->sc_hdev.sc_parent->sc_udev, &sc->sc_ledtask, + USB_TASKQ_DRIVER, NULL); + /* The console keyboard does not get a disable call, so check pipe. */ if (sc->sc_hdev.sc_state & UHIDEV_OPEN) uhidev_close(&sc->sc_hdev);