diff options
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/hdmi4.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/dss/hdmi4.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c index bf800cede2ad..1d1f2e0b2b2a 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c @@ -780,9 +780,7 @@ static int hdmi4_bind(struct device *dev, struct device *master, void *data) r = hdmi_audio_register(hdmi); if (r) { DSSERR("Registering HDMI audio failed\n"); - hdmi_uninit_output(hdmi); - pm_runtime_disable(&pdev->dev); - return r; + goto err_uninit_output; } hdmi->debugfs = dss_debugfs_create_file(dss, "hdmi", hdmi_dump_regs, @@ -790,6 +788,9 @@ static int hdmi4_bind(struct device *dev, struct device *master, void *data) return 0; +err_uninit_output: + hdmi_uninit_output(hdmi); + pm_runtime_disable(&pdev->dev); err_pll: hdmi_pll_uninit(&hdmi->pll); err_free: |