[src/netbsd-7]: src/sys/dev/sdmmc Pull up following revision(s) (requested by...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6c5bfde5d1dd
branches:  netbsd-7
changeset: 798389:6c5bfde5d1dd
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Oct 02 14:42:53 2014 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #124):
        sys/dev/sdmmc/sdhc.c: revision 1.49
Correct clk div calculation for SD 3.0 controllers.

diffstat:

 sys/dev/sdmmc/sdhc.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 6fda16e04209 -r 6c5bfde5d1dd sys/dev/sdmmc/sdhc.c
--- a/sys/dev/sdmmc/sdhc.c      Wed Oct 01 08:54:46 2014 +0000
+++ b/sys/dev/sdmmc/sdhc.c      Thu Oct 02 14:42:53 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sdhc.c,v 1.44.2.1 2014/10/01 08:53:43 martin Exp $     */
+/*     $NetBSD: sdhc.c,v 1.44.2.2 2014/10/02 14:42:53 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.1 2014/10/01 08:53:43 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.44.2.2 2014/10/02 14:42:53 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_sdmmc.h"
@@ -814,6 +814,8 @@
        }
        if (hp->specver == SDHC_SPEC_VERS_300) {
                div = howmany(hp->clkbase, freq);
+               if (div > 0)
+                       --div;
                if (div > 0x3ff)
                        return false;
                *divp = (((div >> 8) & SDHC_SDCLK_XDIV_MASK)