From owner-svn-src-head@FreeBSD.ORG  Fri Feb 26 09:31:51 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 50BF91065675;
	Fri, 26 Feb 2010 09:31:51 +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 3FCAA8FC13;
	Fri, 26 Feb 2010 09:31:51 +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 o1Q9Vpx7097622;
	Fri, 26 Feb 2010 09:31:51 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1Q9VpBB097620;
	Fri, 26 Feb 2010 09:31:51 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201002260931.o1Q9VpBB097620@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 26 Feb 2010 09:31:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204351 - head/sys/dev/sound/pci/hda
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Feb 2010 09:31:51 -0000

Author: mav
Date: Fri Feb 26 09:31:50 2010
New Revision: 204351
URL: http://svn.freebsd.org/changeset/base/204351

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

Modified:
  head/sys/dev/sound/pci/hda/hdac.c

Modified: head/sys/dev/sound/pci/hda/hdac.c
==============================================================================
--- head/sys/dev/sound/pci/hda/hdac.c	Fri Feb 26 07:22:07 2010	(r204350)
+++ head/sys/dev/sound/pci/hda/hdac.c	Fri Feb 26 09:31:50 2010	(r204351)
@@ -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. */