Author: mav
Date: Sun Sep 16 12:08:06 2012
New Revision: 240560
URL: http://svn.freebsd.org/changeset/base/240560

Log:
  MFC r239326:
  Fix "speaker" volume control, broken at r230451.

Modified:
  stable/8/sys/dev/sound/pci/hda/hdaa.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/dev/   (props changed)
  stable/8/sys/dev/sound/   (props changed)
  stable/8/sys/dev/sound/pci/   (props changed)

Modified: stable/8/sys/dev/sound/pci/hda/hdaa.c
==============================================================================
--- stable/8/sys/dev/sound/pci/hda/hdaa.c       Sun Sep 16 12:06:45 2012        
(r240559)
+++ stable/8/sys/dev/sound/pci/hda/hdaa.c       Sun Sep 16 12:08:06 2012        
(r240560)
@@ -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-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to