From c5d235fce3260e104565e22c66d46047d39c3342 Mon Sep 17 00:00:00 2001 From: Andrzej Hajda Date: Thu, 11 Jun 2015 15:13:26 +0200 Subject: drm/exynos/hdmi: fix removal order DRM device should be destroyed first, before resources unbinding. Signed-off-by: Andrzej Hajda --- drivers/gpu/drm/exynos/exynos_hdmi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/drm/exynos') diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 5ee71638ea76..f3f51bdc3fcd 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -2708,6 +2708,10 @@ static int hdmi_remove(struct platform_device *pdev) cancel_delayed_work_sync(&hdata->hotplug_work); + component_del(&pdev->dev, &hdmi_component_ops); + + pm_runtime_disable(&pdev->dev); + if (hdata->res.reg_hdmi_en) regulator_disable(hdata->res.reg_hdmi_en); @@ -2715,9 +2719,6 @@ static int hdmi_remove(struct platform_device *pdev) put_device(&hdata->hdmiphy_port->dev); put_device(&hdata->ddc_adpt->dev); - pm_runtime_disable(&pdev->dev); - component_del(&pdev->dev, &hdmi_component_ops); - return 0; } -- cgit v1.2.3