Module Name: src
Committed By: jmcneill
Date: Mon Aug 5 21:55:47 UTC 2013
Modified Files:
src/sys/arch/arm/omap: omap3_sdhc.c
Log Message:
fix a bug in obiosdhc_bus_clock where SYSCTL_CEN bit wasnt being cleared or set
properly, from Rui Paulo
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/omap/omap3_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/arch/arm/omap/omap3_sdhc.c
diff -u src/sys/arch/arm/omap/omap3_sdhc.c:1.12 src/sys/arch/arm/omap/omap3_sdhc.c:1.13
--- src/sys/arch/arm/omap/omap3_sdhc.c:1.12 Fri Jun 28 00:50:22 2013
+++ src/sys/arch/arm/omap/omap3_sdhc.c Mon Aug 5 21:55:47 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: omap3_sdhc.c,v 1.12 2013/06/28 00:50:22 matt Exp $ */
+/* $NetBSD: omap3_sdhc.c,v 1.13 2013/08/05 21:55:47 jmcneill Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap3_sdhc.c,v 1.12 2013/06/28 00:50:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_sdhc.c,v 1.13 2013/08/05 21:55:47 jmcneill Exp $");
#include "opt_omap.h"
@@ -372,9 +372,9 @@ obiosdhc_bus_clock(struct sdhc_softc *sc
ctl = bus_space_read_4(osc->sc_bst, osc->sc_bsh, MMCHS_SYSCTL);
if (clk == 0) {
- clk &= ~SYSCTL_CEN;
+ ctl &= ~SYSCTL_CEN;
} else {
- clk |= SYSCTL_CEN;
+ ctl |= SYSCTL_CEN;
}
bus_space_write_4(osc->sc_bst, osc->sc_bsh, MMCHS_SYSCTL, ctl);
