summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Meuser <jakemsr@cvs.openbsd.org>2008-12-21 21:25:02 +0000
committerJacob Meuser <jakemsr@cvs.openbsd.org>2008-12-21 21:25:02 +0000
commit9fdeec9d1a1c94267d7e7561e3031726c4f1c1eb (patch)
treee19cf9c34dd27d90784b83b3ab1b5d0010b14d6a
parent5195fe301edf62ff0c2226f04717d78f2caf3d61 (diff)
move the codec specific widget initialization out of
azalia_widget_label_widgets to right after the generic widget initialization. nothing uses this yet.
-rw-r--r--sys/dev/pci/azalia.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c
index c23d56de6ee..8d9e80015f2 100644
--- a/sys/dev/pci/azalia.c
+++ b/sys/dev/pci/azalia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: azalia.c,v 1.83 2008/12/21 20:47:55 jakemsr Exp $ */
+/* $OpenBSD: azalia.c,v 1.84 2008/12/21 21:25:01 jakemsr Exp $ */
/* $NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $ */
/*-
@@ -1293,6 +1293,8 @@ azalia_codec_init(codec_t *this)
if (err)
return err;
#endif
+ if (this->init_widget != NULL)
+ this->init_widget(this, &this->w[i], this->w[i].nid);
}
/* Find widgets without any enabled inputs and disable them.
* Must be done after all widgets are initialized and
@@ -1890,8 +1892,6 @@ azalia_widget_label_widgets(codec_t *codec)
wtypes[w->type]);
break;
}
- if (codec->init_widget != NULL)
- codec->init_widget(codec, w, w->nid);
}
/* Rename mixers and selectors that connect to only one other