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

Commit fc919b85 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: check q6 data before using it in pil mss"

parents 68cc6893 929c2ec9

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

+8 −1
Original line number Original line Diff line number Diff line
@@ -209,7 +209,7 @@ static irqreturn_t modem_wdog_bite_intr_handler(int irq, void *dev_id) 
static int pil_subsys_init(struct modem_data *drv,

static int pil_subsys_init(struct modem_data *drv,

					struct platform_device *pdev)

					struct platform_device *pdev)

{

{

	int ret;

	int ret = -EINVAL;





	drv->subsys_desc.name = "modem";

	drv->subsys_desc.name = "modem";

	drv->subsys_desc.dev = &pdev->dev;

	drv->subsys_desc.dev = &pdev->dev;
@@ -222,6 +222,13 @@ static int pil_subsys_init(struct modem_data *drv, 
	drv->subsys_desc.stop_ack_handler = modem_stop_ack_intr_handler;

	drv->subsys_desc.stop_ack_handler = modem_stop_ack_intr_handler;

	drv->subsys_desc.wdog_bite_handler = modem_wdog_bite_intr_handler;

	drv->subsys_desc.wdog_bite_handler = modem_wdog_bite_intr_handler;





	if (IS_ERR_OR_NULL(drv->q6)) {

		ret = PTR_ERR(drv->q6);

		dev_err(&pdev->dev, "Pil q6 data is err %pK %d!!!\n",

			drv->q6, ret);

		goto err_subsys;

	}



	drv->q6->desc.modem_ssr = false;

	drv->q6->desc.modem_ssr = false;

	drv->q6->desc.signal_aop = of_property_read_bool(pdev->dev.of_node,

	drv->q6->desc.signal_aop = of_property_read_bool(pdev->dev.of_node,

						"qcom,signal-aop");

						"qcom,signal-aop");