From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
To: gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Subject: [PATCH 6/7] slimbus: qcom-ngd-ctrl: Avoid sending power requests without QMI
Date: Fri, 27 Nov 2020 10:24:50 +0000 [thread overview]
Message-ID: <20201127102451.17114-7-srinivas.kandagatla@linaro.org> (raw)
In-Reply-To: <20201127102451.17114-1-srinivas.kandagatla@linaro.org>
From: Bjorn Andersson <bjorn.andersson@linaro.org>
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: 917809e2280b ("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>
---
drivers/slimbus/qcom-ngd-ctrl.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c
index 172ddcc2a241..82dad7490588 100644
--- a/drivers/slimbus/qcom-ngd-ctrl.c
+++ b/drivers/slimbus/qcom-ngd-ctrl.c
@@ -1229,6 +1229,9 @@ static int qcom_slim_ngd_runtime_resume(struct device *dev)
struct qcom_slim_ngd_ctrl *ctrl = dev_get_drvdata(dev);
int ret = 0;
+ if (!ctrl->qmi.handle)
+ return 0;
+
if (ctrl->state >= QCOM_SLIM_NGD_CTRL_ASLEEP)
ret = qcom_slim_ngd_power_up(ctrl);
if (ret) {
@@ -1616,6 +1619,9 @@ static int __maybe_unused qcom_slim_ngd_runtime_suspend(struct device *dev)
struct qcom_slim_ngd_ctrl *ctrl = dev_get_drvdata(dev);
int ret = 0;
+ if (!ctrl->qmi.handle)
+ return 0;
+
ret = qcom_slim_qmi_power_request(ctrl, false);
if (ret && ret != -EBUSY)
dev_info(ctrl->dev, "slim resource not idle:%d\n", ret);
--
2.21.0
next prev parent reply other threads:[~2020-11-27 10:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-27 10:24 [PATCH 0/7] slimbus: patches for 5.11 Srinivas Kandagatla
2020-11-27 10:24 ` [PATCH 1/7] slimbus: fix a kernel-doc markup Srinivas Kandagatla
2020-11-27 10:24 ` [PATCH 2/7] slimbus: qcom-ngd-ctrl: add Sub System Restart support Srinivas Kandagatla
2020-11-27 10:24 ` [PATCH 3/7] slimbus: qcom-ngd-ctrl: add Protection Domain Restart Support Srinivas Kandagatla
2020-11-27 10:24 ` [PATCH 4/7] slimbus: messaging: Fix fall-through warnings for Clang Srinivas Kandagatla
2020-11-27 10:24 ` [PATCH 5/7] slimbus: qcom-ngd-ctrl: Constify static structs Srinivas Kandagatla
2020-11-27 10:24 ` Srinivas Kandagatla [this message]
2020-11-27 10:24 ` [PATCH 7/7] slimbus: qcom-ngd-ctrl: remove redundant out of memory messages Srinivas Kandagatla
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201127102451.17114-7-srinivas.kandagatla@linaro.org \
--to=srinivas.kandagatla@linaro.org \
--cc=bjorn.andersson@linaro.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).