summaryrefslogtreecommitdiffstats
path: root/freebsd/sys/dev/sdhci
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2019-09-23 12:49:10 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2019-09-23 15:07:12 +0200
commit37323bb8196bb2d865115a976d6d972fedd498de (patch)
tree42007e9e2f64c470dfbe42f321fec1bd1d54c2c7 /freebsd/sys/dev/sdhci
parentAdd pselect() (diff)
downloadrtems-libbsd-37323bb8196bb2d865115a976d6d972fedd498de.tar.bz2
Update to FreeBSD stable/12 2019-09-23
Git mirror commit 7e8d1444023128d34fb9aa4e4515928a4f794d1b.
Diffstat (limited to 'freebsd/sys/dev/sdhci')
-rw-r--r--freebsd/sys/dev/sdhci/sdhci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/freebsd/sys/dev/sdhci/sdhci.c b/freebsd/sys/dev/sdhci/sdhci.c
index 952fbd50..5d9cf26c 100644
--- a/freebsd/sys/dev/sdhci/sdhci.c
+++ b/freebsd/sys/dev/sdhci/sdhci.c
@@ -478,7 +478,7 @@ sdhci_set_power(struct sdhci_slot *slot, u_char power)
DELAY(100);
}
if (!(RD1(slot, SDHCI_POWER_CONTROL) & SDHCI_POWER_ON))
- slot_printf(slot, "Bus power failed to enable");
+ slot_printf(slot, "Bus power failed to enable\n");
if (slot->quirks & SDHCI_QUIRK_INTEL_POWER_UP_RESET) {
WR1(slot, SDHCI_POWER_CONTROL, pwr | 0x10);
@@ -1113,7 +1113,7 @@ no_tuning:
slot->timeout = 10;
SYSCTL_ADD_INT(device_get_sysctl_ctx(slot->bus),
SYSCTL_CHILDREN(device_get_sysctl_tree(slot->bus)), OID_AUTO,
- "timeout", CTLFLAG_RW, &slot->timeout, 0,
+ "timeout", CTLFLAG_RWTUN, &slot->timeout, 0,
"Maximum timeout for SDHCI transfers (in secs)");
TASK_INIT(&slot->card_task, 0, sdhci_card_task, slot);
TIMEOUT_TASK_INIT(taskqueue_swi_giant, &slot->card_delayed_task, 0,