summaryrefslogtreecommitdiff
path: root/drivers/crypto
diff options
context:
space:
mode:
authorHiroshi Doyu <hdoyu@nvidia.com>2013-12-18 07:54:17 +0200
committerMitch Luban <mluban@nvidia.com>2013-12-19 11:11:15 -0800
commitee60effce9e98e8de333fba0cda1ae7b77263c15 (patch)
tree5ceadc1a59cbba85397f9628c9a11cda35dda8ae /drivers/crypto
parentb3ca41b6207c12646de66f64c4c8f62ac054205c (diff)
crypto: tegra-se: fix allocation failure
This is the fix for: "crypto: tegra-se: avoid ctx save buf from highmem" when it causes allocation failure because of OOM. Bug 1414172 Bug 1427490 Change-Id: I3287849f2d144b131d413e16cc410ff13ab7ad05 Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com> Reviewed-on: http://git-master/r/346861 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Mitch Luban <mluban@nvidia.com>
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/tegra-se.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/tegra-se.c b/drivers/crypto/tegra-se.c
index 0488527b9c79..398d7d2457db 100644
--- a/drivers/crypto/tegra-se.c
+++ b/drivers/crypto/tegra-se.c
@@ -2741,11 +2741,11 @@ static int tegra_se_probe(struct platform_device *pdev)
if (!se_dev->chipdata->drbg_supported)
se_dev->ctx_save_buf = dma_alloc_coherent(se_dev->dev,
SE_CONTEXT_BUFER_SIZE, &se_dev->ctx_save_buf_adr,
- GFP_DMA32);
+ GFP_KERNEL | GFP_DMA32);
else
se_dev->ctx_save_buf = dma_alloc_coherent(se_dev->dev,
SE_CONTEXT_DRBG_BUFER_SIZE,
- &se_dev->ctx_save_buf_adr, GFP_DMA32);
+ &se_dev->ctx_save_buf_adr, GFP_KERNEL | GFP_DMA32);
if (!se_dev->ctx_save_buf) {
dev_err(se_dev->dev, "Context save buffer alloc filed\n");