 @@ -1,14 +1,14 @@
-/* $NetBSD: hdaudio.c,v 1.9.2.1 2020/12/28 20:18:09 martin Exp $ */
+/* $NetBSD: hdaudio.c,v 1.9.2.2 2020/12/28 20:21:54 martin Exp $ */
 /*
  * Copyright (c) 2009 Precedence Technologies Ltd <support@precedence.co.uk>
  * Copyright (c) 2009 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Precedence Technologies Ltd
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -20,27 +20,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.9.2.1 2020/12/28 20:18:09 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdaudio.c,v 1.9.2.2 2020/12/28 20:21:54 martin Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/bus.h>
 #include <sys/kmem.h>
 #include <sys/module.h>
 #include "hdaudiovar.h"
 #include "hdaudioreg.h"
 #include "hdaudioio.h"
 @@ -703,53 +703,63 @@ hdaudio_attach_fg(struct hdaudio_functio
 		prop_dictionary_set(args, "pin-config", config);
 	locs[0] = fg->fg_nid;
 	fg->fg_device = config_found_sm_loc(sc->sc_dev, "hdaudiobus",
 	    locs, args, hdaudio_config_print, config_stdsubmatch);
 	prop_object_release(args);
+}
 static void
 hdaudio_codec_attach(struct hdaudio_codec *co)
+{
 	struct hdaudio_softc *sc = co->co_host;
 	struct hdaudio_function_group *fg;
 	uint32_t vid, snc, fgrp;
 	int starting_node, num_nodes, nid;
 	if (co->co_valid == false)
 		return;
 	vid = hdaudio_command(co, 0, CORB_GET_PARAMETER, COP_VENDOR_ID);
 	snc = hdaudio_command(co, 0, CORB_GET_PARAMETER,
 	    COP_SUBORDINATE_NODE_COUNT);
 	/* make sure the vendor and product IDs are valid */
 	if (vid == 0xffffffff || vid == 0x00000000)
 		return;
 #ifdef HDAUDIO_DEBUG
 	struct hdaudio_softc *sc = co->co_host;
 	uint32_t rid = hdaudio_command(co, 0, CORB_GET_PARAMETER,
 	    COP_REVISION_ID);
 	hda_print(sc, "Codec%02X: %04X:%04X HDA %d.%d rev %d stepping %d\n",
 	    co->co_addr, vid >> 16, vid & 0xffff,
 	    (rid >> 20) & 0xf, (rid >> 16) & 0xf,
 	    (rid >> 8) & 0xff, rid & 0xff);
 #endif
 	starting_node = (snc >> 16) & 0xff;
 	num_nodes = snc & 0xff;
 	/*
 	 * If the total number of nodes is 0, there's nothing we can do.
 	 * This shouldn't happen, so complain about it.
 	 */
 	if (num_nodes == 0) {
 		hda_error(sc, "Codec%02X: No subordinate nodes found (%08x)\n",
 		    co->co_addr, snc);
 		return;
+	}
 	co->co_nfg = num_nodes;
 	co->co_fg = kmem_zalloc(co->co_nfg * sizeof(*co->co_fg), KM_SLEEP);
 	for (nid = starting_node; nid < starting_node + num_nodes; nid++) {
 		fg = &co->co_fg[nid - starting_node];
 		fg->fg_codec = co;
 		fg->fg_nid = nid;
 		fg->fg_vendor = vid >> 16;
 		fg->fg_product = vid & 0xffff;
 		fgrp = hdaudio_command(co, nid, CORB_GET_PARAMETER,
 		    COP_FUNCTION_GROUP_TYPE);
 		switch (fgrp & 0xff) {