diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-15 06:11:25 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-15 06:11:25 -0800 |
| commit | de97496f9b160f5563df7efecc01581cb71c67e5 (patch) | |
| tree | d55b3ca53b5bfac261042681965570bbf79befa7 | |
| parent | 326d8d9480b153931dcc3e2f49a63ad6ad395670 (diff) | |
| parent | 56b076a17ff78754a61c701e0acdabdd02f77aca (diff) | |
Merge "msm: ipa: use GFP_ATOMIC for DMA memory allocation during SSR"
| -rw-r--r-- | drivers/platform/msm/ipa/ipa_v2/ipa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/msm/ipa/ipa_v2/ipa.c b/drivers/platform/msm/ipa/ipa_v2/ipa.c index 1e79fd954969..fde087f07226 100644 --- a/drivers/platform/msm/ipa/ipa_v2/ipa.c +++ b/drivers/platform/msm/ipa/ipa_v2/ipa.c @@ -1827,7 +1827,7 @@ static int ipa_q6_clean_q6_tables(void) u32 max_cmds = ipa_get_max_flt_rt_cmds(ipa_ctx->ipa_num_pipes); mem.base = dma_alloc_coherent(ipa_ctx->pdev, 4, &mem.phys_base, - GFP_KERNEL); + GFP_ATOMIC); if (!mem.base) { IPAERR("failed to alloc DMA buff of size 4\n"); return -ENOMEM; |