Module Name: src Committed By: riz Date: Sat Nov 7 16:14:37 UTC 2015
Modified Files: src/sys/arch/arm/allwinner [netbsd-7-0]: awin_mmc.c Log Message: Pull up following revision(s) (requested by bouyer in ticket #1006): sys/arch/arm/allwinner/awin_mmc.c: revision 1.22 Avoid a divide by 0 when unplugging a sd card. To generate a diff of this commit: cvs rdiff -u -r1.3.10.3 -r1.3.10.3.2.1 src/sys/arch/arm/allwinner/awin_mmc.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/arch/arm/allwinner/awin_mmc.c diff -u src/sys/arch/arm/allwinner/awin_mmc.c:1.3.10.3 src/sys/arch/arm/allwinner/awin_mmc.c:1.3.10.3.2.1 --- src/sys/arch/arm/allwinner/awin_mmc.c:1.3.10.3 Thu Dec 4 11:08:38 2014 +++ src/sys/arch/arm/allwinner/awin_mmc.c Sat Nov 7 16:14:37 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: awin_mmc.c,v 1.3.10.3 2014/12/04 11:08:38 martin Exp $ */ +/* $NetBSD: awin_mmc.c,v 1.3.10.3.2.1 2015/11/07 16:14:37 riz Exp $ */ /*- * Copyright (c) 2014 Jared D. McNeill <jmcne...@invisible.ca> @@ -29,7 +29,7 @@ #include "locators.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: awin_mmc.c,v 1.3.10.3 2014/12/04 11:08:38 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: awin_mmc.c,v 1.3.10.3.2.1 2015/11/07 16:14:37 riz Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -510,7 +510,10 @@ awin_mmc_bus_clock(sdmmc_chipset_handle_ sdly = awin_chip_id() == AWIN_CHIP_ID_A31 ? 0 : 7; clksrc = AWIN_SD_CLK_SRC_SEL_OSC24M; n = 2; - m = ((osc24m_freq / (1 << n)) / freq) - 1; + if (freq > 0) + m = ((osc24m_freq / (1 << n)) / freq) - 1; + else + m = 15; } else if (freq <= 25000) { odly = 0; sdly = 5;