From owner-svn-src-all@FreeBSD.ORG  Mon Mar  1 19:43:26 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B7B7E106566B;
	Mon,  1 Mar 2010 19:43:26 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A70978FC14;
	Mon,  1 Mar 2010 19:43:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o21JhQ3s098581;
	Mon, 1 Mar 2010 19:43:26 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o21JhQxt098579;
	Mon, 1 Mar 2010 19:43:26 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201003011943.o21JhQxt098579@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 1 Mar 2010 19:43:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204532 - stable/8/sys/dev/sound/pci/hda
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Mar 2010 19:43:26 -0000

Author: mav
Date: Mon Mar  1 19:43:26 2010
New Revision: 204532
URL: http://svn.freebsd.org/changeset/base/204532

Log:
  MFC r204351:
  Fix bug in headphones audio redirection using separate DAC. It was exposed
  by removing channel duplication during multichannel audio implementation.

Modified:
  stable/8/sys/dev/sound/pci/hda/hdac.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/netinet/   (props changed)

Modified: stable/8/sys/dev/sound/pci/hda/hdac.c
==============================================================================
--- stable/8/sys/dev/sound/pci/hda/hdac.c	Mon Mar  1 19:36:19 2010	(r204531)
+++ stable/8/sys/dev/sound/pci/hda/hdac.c	Mon Mar  1 19:43:26 2010	(r204532)
@@ -86,7 +86,7 @@
 
 #include "mixer_if.h"
 
-#define HDA_DRV_TEST_REV	"20100122_0141"
+#define HDA_DRV_TEST_REV	"20100226_0142"
 
 SND_DECLARE_FILE("$FreeBSD$");
 
@@ -3503,7 +3503,7 @@ hdac_stream_setup(struct hdac_chan *ch)
 
 		/* If HP redirection is enabled, but failed to use same
 		   DAC, make last DAC to duplicate first one. */
-		if (as->hpredir >= 0 && i == as->pincnt) {
+		if (as->fakeredir && i == (as->pincnt - 1)) {
 			c = (ch->sid << 4);
 		} else {
 			if (map >= 0) /* Map known speaker setups. */