diff options
| author |   patrick <patrick@openbsd.org> | 2020-06-14 18:37:16 +0000 |
|---|---|---|
| committer | patrick <patrick@openbsd.org> | 2020-06-14 18:37:16 +0000 |
| commit | 679ad45b47ec8c8380dd85e5a877a046013fc6ec (patch) | |
| tree | 6a324ef5d5a153d243c7281b41405730d3fd28bb | |
| parent | Get context switching between kernel threads going. (diff) | |
| download | wireguard-openbsd-679ad45b47ec8c8380dd85e5a877a046013fc6ec.tar.xz wireguard-openbsd-679ad45b47ec8c8380dd85e5a877a046013fc6ec.zip | |
Make sure SDHC_HOST_CTL2 is consistently controlled using 2-byte accesses,
otherwise it would lead to unaligned memory access. Fixes a panic on my
MACCHIATObin.
ok kettenis@
| -rw-r--r-- | sys/dev/sdmmc/sdhc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/sdmmc/sdhc.c b/sys/dev/sdmmc/sdhc.c index aee96542c97..591762af459 100644 --- a/sys/dev/sdmmc/sdhc.c +++ b/sys/dev/sdmmc/sdhc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sdhc.c,v 1.67 2020/05/22 10:23:14 patrick Exp $ */ +/* $OpenBSD: sdhc.c,v 1.68 2020/06/14 18:37:16 patrick Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org> @@ -821,7 +821,7 @@ sdhc_signal_voltage(sdmmc_chipset_handle_t sch, int signal_voltage) /* Host controller clears this bit if 1.8V signalling fails. */ if (signal_voltage == SDMMC_SIGNAL_VOLTAGE_180 && - !ISSET(HREAD4(hp, SDHC_HOST_CTL2), SDHC_1_8V_SIGNAL_EN)) + !ISSET(HREAD2(hp, SDHC_HOST_CTL2), SDHC_1_8V_SIGNAL_EN)) return EIO; return 0; |