svn commit: r355031 - head/sys/arm/broadcom/bcm2835

Kyle Evans kevans at FreeBSD.org
Sat Nov 23 13:39:48 UTC 2019


Author: kevans
Date: Sat Nov 23 13:39:47 2019
New Revision: 355031
URL: https://svnweb.freebsd.org/changeset/base/355031

Log:
  bcm2835_sdhci: fix non-INVARIANTS build
  
  sc is now only used to make sure we're not re-entering the data handling
  path erroneously.
  
  Reported by:	Mark Millard

Modified:
  head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c

Modified: head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
==============================================================================
--- head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c	Sat Nov 23 13:23:12 2019	(r355030)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c	Sat Nov 23 13:39:47 2019	(r355031)
@@ -718,7 +718,9 @@ bcm_sdhci_start_dma(struct sdhci_slot *slot)
 static int
 bcm_sdhci_will_handle_transfer(device_t dev, struct sdhci_slot *slot)
 {
+#ifdef INVARIANTS
 	struct bcm_sdhci_softc *sc = device_get_softc(slot->bus);
+#endif
 
 	/*
 	 * This indicates that we somehow let a data interrupt slip by into the


More information about the svn-src-all mailing list