Disable the recently introduced logic used to associate ucc and audio

devices. Caspar Schutijser reported on bugs@ that pressing the volume
keys on his headset causes a usb host controller interrupt storm. I'm
trying to figure out what's going on but since we're approaching release
keep it disabled.

diff --git a/sys/dev/usb/ucc.c b/sys/dev/usb/ucc.c
index ad433d3..aacf7d7 100644 (file)
--- a/sys/dev/usb/ucc.c
+++ b/sys/dev/usb/ucc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ucc.c,v 1.32 2022/03/08 19:32:41 anton Exp $  */
+/*     $OpenBSD: ucc.c,v 1.33 2022/03/29 16:04:36 anton Exp $  */
 
 /*
  * Copyright (c) 2021 Anton Lindqvist <anton@openbsd.org>
@@ -787,7 +787,7 @@ ucc_attach_wskbd(struct ucc_softc *sc, void *cookie)
                .keymap         = &sc->sc_keymap,
                .accessops      = &accessops,
                .accesscookie   = sc,
-               .audiocookie    = cookie,
+               .audiocookie    = NULL, /* XXX cookie */
        };
 
        sc->sc_keydesc[0].name = KB_US;