Module Name: src
Committed By: martin
Date: Sat Oct 4 08:20:11 UTC 2014
Modified Files:
src/sys/dev/sdmmc [netbsd-7]: sdhc.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #127):
sys/dev/sdmmc/sdhc.c: revision 1.50
Fix divisor calculation for SDHC 3.0.
To generate a diff of this commit:
cvs rdiff -u -r1.44.2.3 -r1.44.2.4 src/sys/dev/sdmmc/sdhc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.44.2.3 src/sys/dev/sdmmc/sdhc.c:1.44.2.4
--- src/sys/dev/sdmmc/sdhc.c:1.44.2.3 Fri Oct 3 18:53:56 2014
+++ src/sys/dev/sdmmc/sdhc.c Sat Oct 4 08:20:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.44.2.3 2014/10/03 18:53:56 martin Exp $ */
+/* $NetBSD: sdhc.c,v 1.44.2.4 2014/10/04 08:20:11 martin Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.44.2.3 2014/10/03 18:53:56 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.44.2.4 2014/10/04 08:20:11 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -814,8 +814,7 @@ sdhc_clock_divisor(struct sdhc_host *hp,
}
if (hp->specver == SDHC_SPEC_VERS_300) {
div = howmany(hp->clkbase, freq);
- if (div > 0)
- --div;
+ div = div > 1 ? howmany(div, 2) : 0;
if (div > 0x3ff)
return false;
*divp = (((div >> 8) & SDHC_SDCLK_XDIV_MASK)
