Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48c025d5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: Add proper error checks for ioremap_resource" into msm-4.9

parents f0735393 33e6702e

drivers/soc/qcom/pil-q6v5-mss.c

+2 −2
Original line number Diff line number Diff line
@@ -266,8 +266,8 @@ static int pil_mss_loadable_init(struct modem_data *drv, 
		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,

						    "rmb_base");

		q6->rmb_base = devm_ioremap_resource(&pdev->dev, res);

		if (!q6->rmb_base)

			return -ENOMEM;

		if (IS_ERR(q6->rmb_base))

			return PTR_ERR(q6->rmb_base);

		drv->rmb_base = q6->rmb_base;

		q6_desc->ops = &pil_msa_mss_ops_selfauth;

	}

drivers/soc/qcom/pil-q6v5.c

+2 −2
Original line number Diff line number Diff line
@@ -628,8 +628,8 @@ struct q6v5_data *pil_q6v5_init(struct platform_device *pdev) 


	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qdsp6_base");

	drv->reg_base = devm_ioremap_resource(&pdev->dev, res);

	if (!drv->reg_base)

		return ERR_PTR(-ENOMEM);

	if (IS_ERR(drv->reg_base))

		return drv->reg_base;



	desc = &drv->desc;

	ret = of_property_read_string(pdev->dev.of_node, "qcom,firmware-name",