From owner-svn-src-head@FreeBSD.ORG  Wed Oct 13 14:39:54 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 C1BFB106566B;
	Wed, 13 Oct 2010 14:39:54 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B04D88FC0A;
	Wed, 13 Oct 2010 14:39:54 +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 o9DEdsY9090574;
	Wed, 13 Oct 2010 14:39:54 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9DEdssc090571;
	Wed, 13 Oct 2010 14:39:54 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201010131439.o9DEdssc090571@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Wed, 13 Oct 2010 14:39:54 +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: r213779 - head/sys/dev/sound/pci
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: Wed, 13 Oct 2010 14:39:54 -0000

Author: rpaulo
Date: Wed Oct 13 14:39:54 2010
New Revision: 213779
URL: http://svn.freebsd.org/changeset/base/213779

Log:
  Fix a brain-o: wrong case statement semantics.
  
  Found with:	clang

Modified:
  head/sys/dev/sound/pci/envy24ht.c
  head/sys/dev/sound/pci/spicds.c

Modified: head/sys/dev/sound/pci/envy24ht.c
==============================================================================
--- head/sys/dev/sound/pci/envy24ht.c	Wed Oct 13 14:37:52 2010	(r213778)
+++ head/sys/dev/sound/pci/envy24ht.c	Wed Oct 13 14:39:54 2010	(r213779)
@@ -2236,7 +2236,8 @@ envy24ht_putcfg(struct sc_info *sc)
 	else
 		printf("not implemented\n");
         switch (sc->adcn) {
-        case 0x01 || 0x02:
+        case 0x01:
+	case 0x02:
                 printf("  ADC #: ");
                 printf("%d\n", sc->adcn);
                 break;

Modified: head/sys/dev/sound/pci/spicds.c
==============================================================================
--- head/sys/dev/sound/pci/spicds.c	Wed Oct 13 14:37:52 2010	(r213778)
+++ head/sys/dev/sound/pci/spicds.c	Wed Oct 13 14:39:54 2010	(r213779)
@@ -283,7 +283,8 @@ spicds_set(struct spicds_info *codec, in
 		case SPICDS_TYPE_WM8770:
 			left = left + 27;
 			break;
-		case SPICDS_TYPE_AK4381 || SPICDS_TYPE_AK4396:
+		case SPICDS_TYPE_AK4381:
+		case SPICDS_TYPE_AK4396:
 			left = left * 255 / 100;
 			break;
 		default: