| Message ID | 1468927815-737-1-git-send-email-weiyj_lk@163.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 19 July 2016 at 19:30, Wei Yongjun <weiyj_lk@163.com> wrote: > From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> > > Fix the reset_control_deassert() fail and clk_prepare_enable() fail > error handling of ade_power_up(). > > Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Applied, thanks. -xinliang > --- > drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 10 ++++++++-- > 1 file changed, 8 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c > index c3707d4..e2bd1e6 100644 > --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c > +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c > @@ -258,18 +258,24 @@ static int ade_power_up(struct ade_hw_ctx *ctx) > ret = reset_control_deassert(ctx->reset); > if (ret) { > DRM_ERROR("failed to deassert reset\n"); > - return ret; > + goto err_reset; > } > > ret = clk_prepare_enable(ctx->ade_core_clk); > if (ret) { > DRM_ERROR("failed to enable ade_core_clk (%d)\n", ret); > - return ret; > + goto err_prepare_enable; > } > > ade_init(ctx); > ctx->power_on = true; > return 0; > + > +err_prepare_enable: > + reset_control_assert(ctx->reset); > +err_reset: > + clk_disable_unprepare(ctx->media_noc_clk); > + return ret; > } > > static void ade_power_down(struct ade_hw_ctx *ctx) > > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index c3707d4..e2bd1e6 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -258,18 +258,24 @@ static int ade_power_up(struct ade_hw_ctx *ctx) ret = reset_control_deassert(ctx->reset); if (ret) { DRM_ERROR("failed to deassert reset\n"); - return ret; + goto err_reset; } ret = clk_prepare_enable(ctx->ade_core_clk); if (ret) { DRM_ERROR("failed to enable ade_core_clk (%d)\n", ret); - return ret; + goto err_prepare_enable; } ade_init(ctx); ctx->power_on = true; return 0; + +err_prepare_enable: + reset_control_assert(ctx->reset); +err_reset: + clk_disable_unprepare(ctx->media_noc_clk); + return ret; } static void ade_power_down(struct ade_hw_ctx *ctx)