diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-03 14:56:16 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-03 14:56:16 -0800 |
| commit | 655b6272e6bb32d0abcb12f9e2e329dd28cc97e0 (patch) | |
| tree | f54480c01279bcef08fe17356a3bb9a3c4556337 /drivers | |
| parent | 51e5b8276d324da1f432c49c8c37d579bf20455b (diff) | |
| parent | c50f341bf3f916de321985c7f74ff48eaac60927 (diff) | |
Merge "soc: qcom: pil: Fix error case scenario in subsystem ramdump"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/soc/qcom/peripheral-loader.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/soc/qcom/peripheral-loader.c b/drivers/soc/qcom/peripheral-loader.c index eaeb8d4776fe..2244c64d28af 100644 --- a/drivers/soc/qcom/peripheral-loader.c +++ b/drivers/soc/qcom/peripheral-loader.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2010-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -171,7 +171,11 @@ int pil_do_ramdump(struct pil_desc *desc, void *ramdump_dev) ret = do_elf_ramdump(ramdump_dev, ramdump_segs, count); kfree(ramdump_segs); - if (!ret && desc->subsys_vmid > 0) + if (ret) + pil_err(desc, "%s: Ramdump collection failed for subsys %s rc:%d\n", + __func__, desc->name, ret); + + if (desc->subsys_vmid > 0) ret = pil_assign_mem_to_subsys(desc, priv->region_start, (priv->region_end - priv->region_start)); |