Author: marius
Date: Thu Sep 13 09:20:13 2018
New Revision: 338635
URL: https://svnweb.freebsd.org/changeset/base/338635
Log:
MFC: r338512
Explicitly compare a pointer to NULL. The __builtin_expect() of clang
3.4.1 otherwise isn't able to cope with the expression.
Modified:
stable/11/sys/dev/sdhci/sdhci.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/sdhci/sdhci.c
==============================================================================
--- stable/11/sys/dev/sdhci/sdhci.c Thu Sep 13 09:20:07 2018
(r338634)
+++ stable/11/sys/dev/sdhci/sdhci.c Thu Sep 13 09:20:13 2018
(r338635)
@@ -1455,7 +1455,7 @@ sdhci_set_transfer_mode(struct sdhci_slot *slot, struc
mode = SDHCI_TRNS_BLK_CNT_EN;
if (data->len > 512) {
mode |= SDHCI_TRNS_MULTI;
- if (__predict_true(slot->req->stop &&
+ if (__predict_true(slot->req->stop != NULL &&
!(slot->quirks & SDHCI_QUIRK_BROKEN_AUTO_STOP)))
mode |= SDHCI_TRNS_ACMD12;
}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
