Skip to content

Commit 39014ce

Browse files
anderssongregkh
authored andcommitted
slimbus: qcom-ngd-ctrl: Avoid sending power requests without QMI
Attempting to send a power request during PM operations, when the QMI handle isn't initialized results in a NULL pointer dereference. So check if the QMI handle has been initialized before attempting to post the power requests. Fixes: 917809e ("slimbus: ngd: Add qcom SLIMBus NGD driver") Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Link: https://lore.kernel.org/r/20201127102451.17114-7-srinivas.kandagatla@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent a35c6e1 commit 39014ce

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

drivers/slimbus/qcom-ngd-ctrl.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1229,6 +1229,9 @@ static int qcom_slim_ngd_runtime_resume(struct device *dev)
12291229
struct qcom_slim_ngd_ctrl *ctrl = dev_get_drvdata(dev);
12301230
int ret = 0;
12311231

1232+
if (!ctrl->qmi.handle)
1233+
return 0;
1234+
12321235
if (ctrl->state >= QCOM_SLIM_NGD_CTRL_ASLEEP)
12331236
ret = qcom_slim_ngd_power_up(ctrl);
12341237
if (ret) {
@@ -1616,6 +1619,9 @@ static int __maybe_unused qcom_slim_ngd_runtime_suspend(struct device *dev)
16161619
struct qcom_slim_ngd_ctrl *ctrl = dev_get_drvdata(dev);
16171620
int ret = 0;
16181621

1622+
if (!ctrl->qmi.handle)
1623+
return 0;
1624+
16191625
ret = qcom_slim_qmi_power_request(ctrl, false);
16201626
if (ret && ret != -EBUSY)
16211627
dev_info(ctrl->dev, "slim resource not idle:%d\n", ret);

0 commit comments

Comments
 (0)