From owner-svn-src-all@FreeBSD.ORG  Mon Jan 17 19:31:35 2011
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 235F51065670;
	Mon, 17 Jan 2011 19:31:35 +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 135018FC0C;
	Mon, 17 Jan 2011 19:31:35 +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 p0HJVYec010570;
	Mon, 17 Jan 2011 19:31:34 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0HJVYKv010568;
	Mon, 17 Jan 2011 19:31:34 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201101171931.p0HJVYKv010568@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 17 Jan 2011 19:31:34 +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: r217509 - head/sys/dev/mmc
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, 17 Jan 2011 19:31:35 -0000

Author: mav
Date: Mon Jan 17 19:31:34 2011
New Revision: 217509
URL: http://svn.freebsd.org/changeset/base/217509

Log:
  Fix 32bit bit fields handling. This fixes card serial number fetching.
  It was just a cosmetic issue, because that number is only reported in logs.
  
  Reported by:	Michael Butler on current@

Modified:
  head/sys/dev/mmc/mmc.c

Modified: head/sys/dev/mmc/mmc.c
==============================================================================
--- head/sys/dev/mmc/mmc.c	Mon Jan 17 19:17:26 2011	(r217508)
+++ head/sys/dev/mmc/mmc.c	Mon Jan 17 19:31:34 2011	(r217509)
@@ -749,7 +749,7 @@ mmc_get_bits(uint32_t *bits, int bit_len
 	uint32_t retval = bits[i] >> shift;
 	if (size + shift > 32)
 		retval |= bits[i - 1] << (32 - shift);
-	return (retval & ((1 << size) - 1));
+	return (retval & ((1llu << size) - 1));
 }
 
 static void