diff options
| author | Jacob Meuser <jakemsr@cvs.openbsd.org> | 2009-12-15 21:22:05 +0000 |
|---|---|---|
| committer | Jacob Meuser <jakemsr@cvs.openbsd.org> | 2009-12-15 21:22:05 +0000 |
| commit | 910232fc38fb5aa49546a86bf462a1585c0560ed (patch) | |
| tree | 0393d86af564ff6113158528499becef467955ed /sys/dev/pci | |
| parent | 43f6843361aa6e7408f0ce5bd9269caddba6e15e (diff) | |
mono ouputs shouldn't be candidates for exclusive inclusion in the
outputs.master.slaves group. lets outputs.master by default control
more than just the internal speaker on some Dell desktops.
Diffstat (limited to 'sys/dev/pci')
| -rw-r--r-- | sys/dev/pci/azalia.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c index 3425d365bc7..326400f5179 100644 --- a/sys/dev/pci/azalia.c +++ b/sys/dev/pci/azalia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: azalia.c,v 1.162 2009/11/24 10:00:39 jakemsr Exp $ */ +/* $OpenBSD: azalia.c,v 1.163 2009/12/15 21:22:04 jakemsr Exp $ */ /* $NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $ */ /*- @@ -2391,7 +2391,8 @@ azalia_codec_init_volgroups(codec_t *this) for (i = 0; i < this->playvols.nslaves; i++) { w = &this->w[this->playvols.slaves[i]]; if (w->nid == this->input_mixer || - w->parent == this->input_mixer) + w->parent == this->input_mixer || + WIDGET_CHANNELS(w) < 2) continue; j = 0; /* azalia_codec_find_defdac only goes 10 connections deep. |