summaryrefslogtreecommitdiff
path: root/drivers/soc/qcom
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-03-21 13:28:26 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-03-21 13:28:25 -0700
commit44df618d4fc0528de6682e865eb2b7055bd82c52 (patch)
treeb03eeaccccedc69ce0954a9c8142c1b4ab8fa4cc /drivers/soc/qcom
parentdc484ab5fb841e1e8ea838255dc30ea539c3bc6e (diff)
parent6d92cc1d610c1f42f266a84ed1812854cafcdc8a (diff)
Merge "soc: qcom: pil: Using devm_ioremap for mapping cx ipeak register"
Diffstat (limited to 'drivers/soc/qcom')
-rw-r--r--drivers/soc/qcom/pil-q6v5-mss.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/soc/qcom/pil-q6v5-mss.c b/drivers/soc/qcom/pil-q6v5-mss.c
index 0e023a019280..793edc5b67ed 100644
--- a/drivers/soc/qcom/pil-q6v5-mss.c
+++ b/drivers/soc/qcom/pil-q6v5-mss.c
@@ -276,8 +276,12 @@ static int pil_mss_loadable_init(struct modem_data *drv,
if (q6->cx_ipeak_vote) {
res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
"cxip_lm_vote_clear");
- q6->cxip_lm_vote_clear = devm_ioremap_resource(&pdev->dev,
- res);
+ if (!res) {
+ dev_err(&pdev->dev, "Failed to get resource for ipeak reg\n");
+ return -EINVAL;
+ }
+ q6->cxip_lm_vote_clear = devm_ioremap(&pdev->dev,
+ res->start, resource_size(res));
if (!q6->cxip_lm_vote_clear)
return -ENOMEM;
}