svn commit: r318791 - stable/11/sys/dev/sdhci

[Luiz Otavio O Souza]

Author: loos
Date: Wed May 24 16:39:19 2017
New Revision: 318791
URL: https://svnweb.freebsd.org/changeset/base/318791

Log:
  MFC r312346:
  
  Set the the wp_disabled flag when asked to.
  
  While here, add the missing new line.
  
  Sponsored by:	Rubicon Communications, LLC (Netgate)

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

Modified: stable/11/sys/dev/sdhci/sdhci_fdt_gpio.c
==============================================================================
--- stable/11/sys/dev/sdhci/sdhci_fdt_gpio.c	Wed May 24 16:30:38 2017	(r318790)
+++ stable/11/sys/dev/sdhci/sdhci_fdt_gpio.c	Wed May 24 16:39:19 2017	(r318791)
@@ -90,7 +90,7 @@ cd_setup(struct sdhci_fdt_gpio *gpio, ph
 		gpio->slot->opt |= SDHCI_NON_REMOVABLE;
 		gpio->cd_disabled = true;
 		if (bootverbose)
-			device_printf(dev, "Non-removable media");
+			device_printf(dev, "Non-removable media\n");
 		return;
 	}
 
@@ -177,8 +177,12 @@ wp_setup(struct sdhci_fdt_gpio *gpio, ph
 
 	dev = gpio->dev;
 
-	if (OF_hasprop(node, "wp-disable"))
+	if (OF_hasprop(node, "wp-disable")) {
+		gpio->wp_disabled = true;
+		if (bootverbose)
+			device_printf(dev, "Write protect disabled\n");
 		return;
+	}
 
 	if (gpio_pin_get_by_ofw_property(dev, node, "wp-gpios", &gpio->wp_pin))
 		return;