summaryrefslogtreecommitdiffstats
path: root/drivers/crypto/caam/ctrl.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2019-06-20 08:17:24 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2019-06-20 08:17:24 +0200
commitbdb275bb6486d19888cb669fedd7d3eea2031669 (patch)
treea6d78624f1e8d7a797803636d1d92e6ae584949b /drivers/crypto/caam/ctrl.c
parentcrypto: sahara - Use devm_platform_ioremap_resource() (diff)
parentcrypto: hmac - fix memory leak in hmac_init_tfm() (diff)
downloadlinux-bdb275bb6486d19888cb669fedd7d3eea2031669.tar.xz
linux-bdb275bb6486d19888cb669fedd7d3eea2031669.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge crypto tree to pick up vmx changes.
Diffstat (limited to 'drivers/crypto/caam/ctrl.c')
-rw-r--r--drivers/crypto/caam/ctrl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 5d197e879899..4e43ca4d3656 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -469,7 +469,7 @@ static int caam_get_era(struct caam_ctrl __iomem *ctrl)
}
/*
- * ERRATA: imx6 devices (imx6D, imx6Q, imx6DL, imx6S, imx6DP and imx6DQ)
+ * ERRATA: imx6 devices (imx6D, imx6Q, imx6DL, imx6S, imx6DP and imx6QP)
* have an issue wherein AXI bus transactions may not occur in the correct
* order. This isn't a problem running single descriptors, but can be if
* running multiple concurrent descriptors. Reworking the driver to throttle