From: anton <anton@openbsd.org>
Date: Tue, 29 Mar 2022 16:04:36 +0000 (+0000)
Subject: Disable the recently introduced logic used to associate ucc and audio
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=646ecd99c01c325e6ca2cc3fdc721f2424e2e9bd;p=openbsd

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 ad433d3bc08..aacf7d7f796 100644
--- 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;