From: Bjorn Andersson <bjorn.andersson@linaro.org>
To: Rajendra Nayak <rnayak@codeaurora.org>
Cc: stanimir.varbanov@linaro.org, robh+dt@kernel.org,
agross@kernel.org, linux-arm-msm@vger.kernel.org,
linux-media@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, mka@chromium.org
Subject: Re: [PATCH v5 2/5] media: venus: core: Fix error handling in probe
Date: Wed, 29 Jul 2020 12:30:36 -0700 [thread overview]
Message-ID: <20200729193036.GI229995@builder.lan> (raw)
In-Reply-To: <1596007005-30425-3-git-send-email-rnayak@codeaurora.org>
On Wed 29 Jul 00:16 PDT 2020, Rajendra Nayak wrote:
> Post a successful pm_ops->core_get, an error in probe
> should exit by doing a pm_ops->core_put which seems
> to be missing. So fix it.
>
> Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
> Acked-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> ---
> drivers/media/platform/qcom/venus/core.c | 15 ++++++++++-----
> 1 file changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
> index 203c653..bfcaba3 100644
> --- a/drivers/media/platform/qcom/venus/core.c
> +++ b/drivers/media/platform/qcom/venus/core.c
> @@ -224,13 +224,15 @@ static int venus_probe(struct platform_device *pdev)
>
> ret = dma_set_mask_and_coherent(dev, core->res->dma_mask);
> if (ret)
> - return ret;
> + goto err_core_put;
>
> if (!dev->dma_parms) {
> dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms),
> GFP_KERNEL);
> - if (!dev->dma_parms)
> - return -ENOMEM;
> + if (!dev->dma_parms) {
> + ret = -ENOMEM;
> + goto err_core_put;
> + }
> }
> dma_set_max_seg_size(dev, DMA_BIT_MASK(32));
>
> @@ -242,11 +244,11 @@ static int venus_probe(struct platform_device *pdev)
> IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
> "venus", core);
> if (ret)
> - return ret;
> + goto err_core_put;
>
> ret = hfi_create(core, &venus_core_ops);
> if (ret)
> - return ret;
> + goto err_core_put;
>
> pm_runtime_enable(dev);
>
> @@ -302,6 +304,9 @@ static int venus_probe(struct platform_device *pdev)
> pm_runtime_set_suspended(dev);
> pm_runtime_disable(dev);
> hfi_destroy(core);
> +err_core_put:
> + if (core->pm_ops->core_put)
> + core->pm_ops->core_put(dev);
> return ret;
> }
>
> --
> QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
> of Code Aurora Forum, hosted by The Linux Foundation
>
next prev parent reply other threads:[~2020-07-29 19:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-29 7:16 [PATCH v5 0/5] DVFS support for Venus Rajendra Nayak
2020-07-29 7:16 ` [PATCH v5 1/5] dt-bindings: media: venus: Add an optional power domain for perf voting Rajendra Nayak
2020-07-29 19:28 ` Bjorn Andersson
2020-07-29 7:16 ` [PATCH v5 2/5] media: venus: core: Fix error handling in probe Rajendra Nayak
2020-07-29 19:30 ` Bjorn Andersson [this message]
2020-07-29 7:16 ` [PATCH v5 3/5] media: venus: core: Add support for opp tables/perf voting Rajendra Nayak
2020-07-29 20:03 ` Bjorn Andersson
2020-07-29 7:16 ` [PATCH v5 4/5] arm64: dts: sdm845: Add OPP tables and power-domains for venus Rajendra Nayak
2020-07-29 7:16 ` [PATCH v5 5/5] arm64: dts: sc7180: " Rajendra Nayak
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=20200729193036.GI229995@builder.lan \
--to=bjorn.andersson@linaro.org \
--cc=agross@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mka@chromium.org \
--cc=rnayak@codeaurora.org \
--cc=robh+dt@kernel.org \
--cc=stanimir.varbanov@linaro.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).