Author: mav
Date: Thu Aug 16 07:43:15 2012
New Revision: 239326
URL: http://svn.freebsd.org/changeset/base/239326
Log:
Fix "speaker" volume control, broken at r230451.
Reported and tested by: Slawa Olhovchenkov <s...@zxy.spb.ru>
MFC after: 1 month
Modified:
head/sys/dev/sound/pci/hda/hdaa.c
Modified: head/sys/dev/sound/pci/hda/hdaa.c
==============================================================================
--- head/sys/dev/sound/pci/hda/hdaa.c Thu Aug 16 06:45:58 2012
(r239325)
+++ head/sys/dev/sound/pci/hda/hdaa.c Thu Aug 16 07:43:15 2012
(r239326)
@@ -2127,11 +2127,14 @@ hdaa_audio_ctl_dev_volume(struct hdaa_pc
w = hdaa_widget_get(devinfo, i);
if (w == NULL || w->enable == 0)
continue;
- if (w->bindas < 0 && pdevinfo->index != 0)
- continue;
- if (w->bindas != pdevinfo->playas &&
- w->bindas != pdevinfo->recas)
- continue;
+ if (w->bindas < 0) {
+ if (pdevinfo->index != 0)
+ continue;
+ } else {
+ if (w->bindas != pdevinfo->playas &&
+ w->bindas != pdevinfo->recas)
+ continue;
+ }
if (dev == SOUND_MIXER_RECLEV &&
w->type == HDA_PARAM_AUDIO_WIDGET_CAP_TYPE_AUDIO_INPUT) {
hdaa_audio_ctl_dest_volume(pdevinfo, dev,
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
