svn commit: r351874 - stable/12/sys/dev/sdhci

Ian Lepore ian at FreeBSD.org
Thu Sep 5 16:53:56 UTC 2019


Author: ian
Date: Thu Sep  5 16:53:55 2019
New Revision: 351874
URL: https://svnweb.freebsd.org/changeset/base/351874

Log:
  MFC r350847:
  
  Allow the sdhci timeout sysctl var to be set as a tunable.  Also, add a
  missing newline in a warning printf.

Modified:
  stable/12/sys/dev/sdhci/sdhci.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/sdhci/sdhci.c
==============================================================================
--- stable/12/sys/dev/sdhci/sdhci.c	Thu Sep  5 16:53:34 2019	(r351873)
+++ stable/12/sys/dev/sdhci/sdhci.c	Thu Sep  5 16:53:55 2019	(r351874)
@@ -476,7 +476,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);
@@ -1111,7 +1111,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,


More information about the svn-src-all mailing list