svn commit: r338512 - head/sys/dev/sdhci

Marius Strobl marius at FreeBSD.org
Thu Sep 6 21:09:55 UTC 2018


Author: marius
Date: Thu Sep  6 21:09:54 2018
New Revision: 338512
URL: https://svnweb.freebsd.org/changeset/base/338512

Log:
  - Explicitly compare a pointer to NULL. The __builtin_expect() of clang
    3.4.1 otherwise isn't able to cope with the expression.
  - Fix a nearby whitespace bug.
  
  Approved by:	re (gjb, kib)

Modified:
  head/sys/dev/sdhci/sdhci.c

Modified: head/sys/dev/sdhci/sdhci.c
==============================================================================
--- head/sys/dev/sdhci/sdhci.c	Thu Sep  6 20:29:40 2018	(r338511)
+++ head/sys/dev/sdhci/sdhci.c	Thu Sep  6 21:09:54 2018	(r338512)
@@ -1575,11 +1575,10 @@ sdhci_set_transfer_mode(struct sdhci_slot *slot, struc
 #ifdef MMCCAM
 		    slot->ccb->mmcio.stop.opcode == MMC_STOP_TRANSMISSION &&
 #else
-		    slot->req->stop &&
+		    slot->req->stop != NULL &&
 #endif
 		    !(slot->quirks & SDHCI_QUIRK_BROKEN_AUTO_STOP)))
 			mode |= SDHCI_TRNS_ACMD12;
-
 	}
 	if (data->flags & MMC_DATA_READ)
 		mode |= SDHCI_TRNS_READ;


More information about the svn-src-all mailing list