From: Dmitry Osipenko <digetx@gmail.com>
To: Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Mark Brown <broonie@kernel.org>, Takashi Iwai <tiwai@suse.com>,
Jaroslav Kysela <perex@perex.cz>,
Liam Girdwood <lgirdwood@gmail.com>, Agneli <poczt@protonmail.ch>,
Rob Herring <robh+dt@kernel.org>
Cc: linux-tegra@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org
Subject: [PATCH v3 14/20] drm/tegra: hdmi: Unwind tegra_hdmi_init() errors
Date: Thu, 2 Dec 2021 19:23:35 +0300 [thread overview]
Message-ID: <20211202162341.1791-15-digetx@gmail.com> (raw)
In-Reply-To: <20211202162341.1791-1-digetx@gmail.com>
Add missing error unwinding to tegra_hdmi_init(), for consistency.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/gpu/drm/tegra/hdmi.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
index 3242baddc5e7..cc42476fd023 100644
--- a/drivers/gpu/drm/tegra/hdmi.c
+++ b/drivers/gpu/drm/tegra/hdmi.c
@@ -1456,22 +1456,31 @@ static int tegra_hdmi_init(struct host1x_client *client)
if (err < 0) {
dev_err(client->dev, "failed to enable HDMI regulator: %d\n",
err);
- return err;
+ goto output_exit;
}
err = regulator_enable(hdmi->pll);
if (err < 0) {
dev_err(hdmi->dev, "failed to enable PLL regulator: %d\n", err);
- return err;
+ goto disable_hdmi;
}
err = regulator_enable(hdmi->vdd);
if (err < 0) {
dev_err(hdmi->dev, "failed to enable VDD regulator: %d\n", err);
- return err;
+ goto disable_pll;
}
return 0;
+
+disable_pll:
+ regulator_disable(hdmi->pll);
+disable_hdmi:
+ regulator_disable(hdmi->hdmi);
+output_exit:
+ tegra_output_exit(&hdmi->output);
+
+ return err;
}
static int tegra_hdmi_exit(struct host1x_client *client)
--
2.33.1
next prev parent reply other threads:[~2021-12-02 16:27 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-02 16:23 [PATCH v3 00/20] Support HDMI audio on NVIDIA Tegra20 Dmitry Osipenko
2021-12-02 16:23 ` [PATCH v3 01/20] ASoC: dt-bindings: Add binding for Tegra20 S/PDIF Dmitry Osipenko
2021-12-02 16:23 ` [PATCH v3 02/20] ASoC: dt-bindings: tegra20-i2s: Convert to schema Dmitry Osipenko
2021-12-02 16:23 ` [PATCH v3 03/20] ASoC: dt-bindings: tegra20-i2s: Document new nvidia,fixed-parent-rate property Dmitry Osipenko
2021-12-02 16:23 ` [PATCH v3 04/20] dt-bindings: host1x: Document optional HDMI sound-dai-cells Dmitry Osipenko
2021-12-02 16:23 ` [PATCH v3 05/20] ASoC: tegra20: spdif: Set FIFO trigger level Dmitry Osipenko
2021-12-02 16:23 ` [PATCH v3 06/20] ASoC: tegra20-spdif: stop setting slave_id Dmitry Osipenko
2021-12-02 16:23 ` [PATCH v3 07/20] ASoC: tegra20: spdif: Support device-tree Dmitry Osipenko
2021-12-02 16:23 ` [PATCH v3 08/20] ASoC: tegra20: spdif: Improve driver's code Dmitry Osipenko
2021-12-02 16:23 ` [PATCH v3 09/20] ASoC: tegra20: spdif: Use more resource-managed helpers Dmitry Osipenko
2021-12-02 16:23 ` [PATCH v3 10/20] ASoC: tegra20: spdif: Reset hardware Dmitry Osipenko
2021-12-02 16:23 ` [PATCH v3 11/20] ASoC: tegra20: spdif: Support system suspend Dmitry Osipenko
2021-12-02 16:23 ` [PATCH v3 12/20] ASoC: tegra20: spdif: Filter out unsupported rates Dmitry Osipenko
2021-12-02 16:23 ` [PATCH v3 13/20] ASoC: tegra20: i2s: " Dmitry Osipenko
2021-12-02 16:23 ` Dmitry Osipenko [this message]
2021-12-02 16:23 ` [PATCH v3 15/20] drm/tegra: hdmi: Register audio CODEC on Tegra20 Dmitry Osipenko
2021-12-02 16:23 ` [PATCH v3 16/20] ARM: tegra_defconfig: Enable S/PDIF driver Dmitry Osipenko
2021-12-02 16:23 ` [PATCH v3 17/20] ARM: tegra: Add S/PDIF node to Tegra20 device-tree Dmitry Osipenko
2021-12-02 16:23 ` [PATCH v3 18/20] ARM: tegra: Add HDMI audio graph " Dmitry Osipenko
2021-12-02 16:23 ` [PATCH v3 19/20] ARM: tegra: acer-a500: Enable S/PDIF and HDMI audio Dmitry Osipenko
2021-12-02 16:23 ` [PATCH v3 20/20] ARM: tegra: paz00: " Dmitry Osipenko
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=20211202162341.1791-15-digetx@gmail.com \
--to=digetx@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=jonathanh@nvidia.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=perex@perex.cz \
--cc=poczt@protonmail.ch \
--cc=robh+dt@kernel.org \
--cc=thierry.reding@gmail.com \
--cc=tiwai@suse.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).