From: Jeffy Chen <jeffy.chen@rock-chips.com>
To: linux-kernel@vger.kernel.org
Cc: dmitry.torokhov@gmail.com, briannorris@chromium.org,
rjw@rjwysocki.net, dianders@chromium.org,
dri-devel@lists.freedesktop.org, tfiga@chromium.org,
linux-rockchip@lists.infradead.org,
Jeffy Chen <jeffy.chen@rock-chips.com>,
broonie@kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH v3 2/5] drm/rockchip: Fix error handling path in rockchip_dp_bind()
Date: Tue, 17 Oct 2017 16:09:22 +0800 [thread overview]
Message-ID: <20171017080925.23763-3-jeffy.chen@rock-chips.com> (raw)
In-Reply-To: <20171017080925.23763-1-jeffy.chen@rock-chips.com>
Add missing error handling in rockchip_dp_bind().
Fixes: 9e32e16e9e98 ("drm: rockchip: dp: add rockchip platform dp driver")
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
Changes in v3: None
Changes in v2: None
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
index 4d3f6ad0abdd..cb8941e8bcdd 100644
--- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
+++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
@@ -371,7 +371,7 @@ static int rockchip_dp_bind(struct device *dev, struct device *master,
ret = rockchip_dp_drm_create_encoder(dp);
if (ret) {
DRM_ERROR("failed to create drm encoder\n");
- return ret;
+ goto err_deinit_dp;
}
dp->plat_data.encoder = &dp->encoder;
@@ -387,7 +387,17 @@ static int rockchip_dp_bind(struct device *dev, struct device *master,
rockchip_drm_psr_register(&dp->encoder, analogix_dp_psr_set);
- return analogix_dp_bind(dev, dp->drm_dev, &dp->plat_data);
+ ret = analogix_dp_bind(dev, dp->drm_dev, &dp->plat_data);
+ if (ret < 0)
+ goto err_unreg_psr;
+ return 0;
+
+err_unreg_psr:
+ rockchip_drm_psr_unregister(&dp->encoder);
+ rockchip_dp_drm_encoder_destroy(&dp->encoder);
+err_deinit_dp:
+ clk_disable_unprepare(dp->pclk);
+ return ret;
}
static void rockchip_dp_unbind(struct device *dev, struct device *master,
--
2.11.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2017-10-17 8:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-17 8:09 [RFC PATCH v3 0/5] rockchip: kevin: Enable edp display Jeffy Chen
2017-10-17 8:09 ` Jeffy Chen [this message]
2017-10-17 8:09 ` [RFC PATCH v3 3/5] drm/bridge/analogix: Do not use device's drvdata Jeffy Chen
2017-10-17 23:42 ` Jingoo Han
2017-10-17 8:09 ` [RFC PATCH v3 5/5] drm/rockchip: Add device links for master and components Jeffy Chen
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=20171017080925.23763-3-jeffy.chen@rock-chips.com \
--to=jeffy.chen@rock-chips.com \
--cc=briannorris@chromium.org \
--cc=broonie@kernel.org \
--cc=dianders@chromium.org \
--cc=dmitry.torokhov@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=rjw@rjwysocki.net \
--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