From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
To: Bard Liao <yung-chuan.liao@linux.intel.com>,
alsa-devel@alsa-project.org, vkoul@kernel.org
Cc: linux-kernel@vger.kernel.org, tiwai@suse.de, broonie@kernel.org,
gregkh@linuxfoundation.org, jank@cadence.com,
rander.wang@linux.intel.com, ranjani.sridharan@linux.intel.com,
hui.wang@canonical.com, pierre-louis.bossart@linux.intel.com,
sanyog.r.kale@intel.com, slawomir.blauciak@intel.com,
mengdong.lin@intel.com
Subject: Re: [RFC 3/5] soundwire: qcom: fix error handling in probe
Date: Mon, 20 Apr 2020 08:42:27 +0100 [thread overview]
Message-ID: <6be6b739-2f5e-e2ba-2ca0-56108f667ffe@linaro.org> (raw)
In-Reply-To: <20200416205524.2043-4-yung-chuan.liao@linux.intel.com>
On 16/04/2020 21:55, Bard Liao wrote:
> From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
>
> Make sure all error cases are properly handled and all resources freed.
>
> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
> ---
Thanks for the patch,
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> drivers/soundwire/qcom.c | 26 +++++++++++++++++---------
> 1 file changed, 17 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
> index d6c9ad231873..e08a17c13f92 100644
> --- a/drivers/soundwire/qcom.c
> +++ b/drivers/soundwire/qcom.c
> @@ -765,12 +765,16 @@ static int qcom_swrm_probe(struct platform_device *pdev)
> }
>
> ctrl->irq = of_irq_get(dev->of_node, 0);
> - if (ctrl->irq < 0)
> - return ctrl->irq;
> + if (ctrl->irq < 0) {
> + ret = ctrl->irq;
> + goto err_init;
> + }
>
> ctrl->hclk = devm_clk_get(dev, "iface");
> - if (IS_ERR(ctrl->hclk))
> - return PTR_ERR(ctrl->hclk);
> + if (IS_ERR(ctrl->hclk)) {
> + ret = PTR_ERR(ctrl->hclk);
> + goto err_init;
> + }
>
> clk_prepare_enable(ctrl->hclk);
>
> @@ -787,7 +791,7 @@ static int qcom_swrm_probe(struct platform_device *pdev)
>
> ret = qcom_swrm_get_port_config(ctrl);
> if (ret)
> - return ret;
> + goto err_clk;
>
> params = &ctrl->bus.params;
> params->max_dr_freq = DEFAULT_CLK_FREQ;
> @@ -814,28 +818,32 @@ static int qcom_swrm_probe(struct platform_device *pdev)
> "soundwire", ctrl);
> if (ret) {
> dev_err(dev, "Failed to request soundwire irq\n");
> - goto err;
> + goto err_clk;
> }
>
> ret = sdw_add_bus_master(&ctrl->bus);
> if (ret) {
> dev_err(dev, "Failed to register Soundwire controller (%d)\n",
> ret);
> - goto err;
> + goto err_clk;
> }
>
> qcom_swrm_init(ctrl);
> ret = qcom_swrm_register_dais(ctrl);
> if (ret)
> - goto err;
> + goto err_master_add;
>
> dev_info(dev, "Qualcomm Soundwire controller v%x.%x.%x Registered\n",
> (ctrl->version >> 24) & 0xff, (ctrl->version >> 16) & 0xff,
> ctrl->version & 0xffff);
>
> return 0;
> -err:
> +
> +err_master_add:
> + sdw_delete_bus_master(&ctrl->bus);
> +err_clk:
> clk_disable_unprepare(ctrl->hclk);
> +err_init:
> return ret;
> }
>
>
next prev parent reply other threads:[~2020-04-20 7:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-16 20:55 [RFC 0/5] soundwire: create master device and use it Bard Liao
2020-04-16 20:55 ` [RFC 1/5] soundwire: bus_type: add sdw_master_device support Bard Liao
2020-04-20 7:26 ` Vinod Koul
2020-04-23 14:24 ` Greg KH
2020-04-28 4:31 ` Vinod Koul
2020-04-28 6:37 ` Greg KH
2020-04-28 6:49 ` Vinod Koul
2020-04-28 6:55 ` Greg KH
2020-04-28 7:51 ` Vinod Koul
[not found] ` <4ecfa01e-4ef4-5368-3a70-2bd57407d2ad@linux.intel.com>
2020-04-30 4:57 ` Vinod Koul
2020-04-16 20:55 ` [RFC 2/5] soundwire: master: use device node pointer from master device Bard Liao
2020-04-16 20:55 ` [RFC 3/5] soundwire: qcom: fix error handling in probe Bard Liao
2020-04-20 7:42 ` Srinivas Kandagatla [this message]
2020-04-16 20:55 ` [RFC 4/5] soundwire: qcom: add sdw_master_device support Bard Liao
2020-04-16 20:55 ` [RFC 5/5] soundwire: intel: transition to sdw_master_device Bard Liao
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=6be6b739-2f5e-e2ba-2ca0-56108f667ffe@linaro.org \
--to=srinivas.kandagatla@linaro.org \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=hui.wang@canonical.com \
--cc=jank@cadence.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mengdong.lin@intel.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=rander.wang@linux.intel.com \
--cc=ranjani.sridharan@linux.intel.com \
--cc=sanyog.r.kale@intel.com \
--cc=slawomir.blauciak@intel.com \
--cc=tiwai@suse.de \
--cc=vkoul@kernel.org \
--cc=yung-chuan.liao@linux.intel.com \
/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).