mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jeffy Chen <jeffy.chen@rock-chips.com>
To: linux-kernel@vger.kernel.org
Cc: dmitry.torokhov@gmail.com, heiko@sntech.de,
	briannorris@chromium.org, rjw@rjwysocki.net,
	dianders@chromium.org, tfiga@chromium.org, broonie@kernel.org,
	seanpaul@chromium.org, Jeffy Chen <jeffy.chen@rock-chips.com>,
	Mark Yao <mark.yao@rock-chips.com>,
	dri-devel@lists.freedesktop.org,
	linux-rockchip@lists.infradead.org,
	David Airlie <airlied@linux.ie>,
	linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH v4 5/8] drm/rockchip: inno_hdmi: Fix error handling path
Date: Tue, 17 Oct 2017 18:16:21 +0800	[thread overview]
Message-ID: <20171017101624.12506-6-jeffy.chen@rock-chips.com> (raw)
In-Reply-To: <20171017101624.12506-1-jeffy.chen@rock-chips.com>

Add missing error handling in bind().

Fixes: 412d4ae6b7a5 ("drm/rockchip: hdmi: add Innosilicon HDMI support")
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---

Changes in v4: None
Changes in v3: None
Changes in v2: None

 drivers/gpu/drm/rockchip/inno_hdmi.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
index ee584d87111f..9c258b05dfa5 100644
--- a/drivers/gpu/drm/rockchip/inno_hdmi.c
+++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
@@ -851,8 +851,10 @@ static int inno_hdmi_bind(struct device *dev, struct device *master,
 	}
 
 	irq = platform_get_irq(pdev, 0);
-	if (irq < 0)
-		return irq;
+	if (irq < 0) {
+		ret = irq;
+		goto err_disable_clk;
+	}
 
 	inno_hdmi_reset(hdmi);
 
@@ -860,7 +862,7 @@ static int inno_hdmi_bind(struct device *dev, struct device *master,
 	if (IS_ERR(hdmi->ddc)) {
 		ret = PTR_ERR(hdmi->ddc);
 		hdmi->ddc = NULL;
-		return ret;
+		goto err_disable_clk;
 	}
 
 	/*
@@ -874,7 +876,7 @@ static int inno_hdmi_bind(struct device *dev, struct device *master,
 
 	ret = inno_hdmi_register(drm, hdmi);
 	if (ret)
-		return ret;
+		goto err_put_adapter;
 
 	dev_set_drvdata(dev, hdmi);
 
@@ -884,7 +886,17 @@ static int inno_hdmi_bind(struct device *dev, struct device *master,
 	ret = devm_request_threaded_irq(dev, irq, inno_hdmi_hardirq,
 					inno_hdmi_irq, IRQF_SHARED,
 					dev_name(dev), hdmi);
+	if (ret < 0)
+		goto err_cleanup_hdmi;
 
+	return 0;
+err_cleanup_hdmi:
+	drm_connector_cleanup(&hdmi->connector);
+	drm_encoder_cleanup(&hdmi->encoder);
+err_put_adapter:
+	i2c_put_adapter(hdmi->ddc);
+err_disable_clk:
+	clk_disable_unprepare(hdmi->pclk);
 	return ret;
 }
 
-- 
2.11.0

  parent reply	other threads:[~2017-10-17 10:17 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-17 10:16 [RFC PATCH v4 0/8] rockchip: kevin: Enable edp display Jeffy Chen
2017-10-17 10:16 ` [RFC PATCH v4 1/8] arm64: dts: rockchip: Enable edp disaplay on kevin Jeffy Chen
2017-10-17 10:16 ` [RFC PATCH v4 2/8] drm/rockchip: analogix_dp: Fix error handling path Jeffy Chen
2017-10-17 17:57   ` Sean Paul
2017-10-17 10:16 ` [RFC PATCH v4 3/8] drm/rockchip: dw-mipi-dsi: " Jeffy Chen
2017-10-17 18:02   ` Sean Paul
2017-10-17 10:16 ` [RFC PATCH v4 4/8] drm/rockchip: dw_hdmi: " Jeffy Chen
2017-10-17 18:10   ` Sean Paul
2017-10-19  1:54     ` jeffy
2017-10-17 10:16 ` Jeffy Chen [this message]
2017-10-17 18:18   ` [RFC PATCH v4 5/8] drm/rockchip: inno_hdmi: " Sean Paul
2017-10-17 10:16 ` [RFC PATCH v4 6/8] drm/bridge/analogix: Do not use device's drvdata Jeffy Chen
2017-10-17 18:18   ` Sean Paul
2017-10-17 23:43   ` Jingoo Han
2017-10-18  4:46     ` Archit Taneja
2017-10-17 10:16 ` [RFC PATCH v4 7/8] pwm: Add dummy pwmchip for orphan pwms Jeffy Chen
2017-10-17 12:40   ` Thierry Reding
2017-10-17 17:04     ` Brian Norris
2017-10-17 18:24       ` Dmitry Torokhov
2017-10-17 18:46         ` Mark Brown
2017-10-17 18:53           ` Brian Norris
2017-10-17 19:05             ` Mark Brown
2017-10-18  5:16               ` jeffy
2017-10-17 10:16 ` [RFC PATCH v4 8/8] drm/rockchip: Add device links for master and components Jeffy Chen
2017-10-17 18:24   ` Sean Paul

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=20171017101624.12506-6-jeffy.chen@rock-chips.com \
    --to=jeffy.chen@rock-chips.com \
    --cc=airlied@linux.ie \
    --cc=briannorris@chromium.org \
    --cc=broonie@kernel.org \
    --cc=dianders@chromium.org \
    --cc=dmitry.torokhov@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=heiko@sntech.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=mark.yao@rock-chips.com \
    --cc=rjw@rjwysocki.net \
    --cc=seanpaul@chromium.org \
    --cc=tfiga@chromium.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

all inboxes | Powered by JetHome®