summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-10-25 23:29:10 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2016-11-01 01:37:12 +0100
commitd69985a07692cbe67c50fa0e0ed8ffbd25cedd71 (patch)
tree0aeda78436684c676ff38a4556cf0b2bfa11f0d3
parentcrypto: sahara - fix typo "Decidated" -> "Dedicated" (diff)
downloadlinux-d69985a07692cbe67c50fa0e0ed8ffbd25cedd71.tar.xz
linux-d69985a07692cbe67c50fa0e0ed8ffbd25cedd71.zip
crypto: caam - fix type mismatch warning
Building the caam driver on arm64 produces a harmless warning: drivers/crypto/caam/caamalg.c:140:139: warning: comparison of distinct pointer types lacks a cast We can use min_t to tell the compiler which type we want it to use here. Fixes: 5ecf8ef9103c ("crypto: caam - fix sg dump") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Horia Geantă <horia.geanta@nxp.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--drivers/crypto/caam/caamalg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index 156aad167cd6..8de85dfb1b04 100644
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -137,7 +137,7 @@ static void dbg_dump_sg(const char *level, const char *prefix_str,
}
buf = it_page + it->offset;
- len = min(tlen, it->length);
+ len = min_t(size_t, tlen, it->length);
print_hex_dump(level, prefix_str, prefix_type, rowsize,
groupsize, buf, len, ascii);
tlen -= len;