diff options
| author | Andrzej Hajda | 2015-09-25 14:48:20 +0200 |
|---|---|---|
| committer | Inki Dae | 2015-10-26 07:09:40 +0100 |
| commit | 2445c4a44f200a3137dbaaa3603f2f095c9fdd45 (patch) | |
| tree | 19b7ee357e1b5e33eab69ff001deb0c9ab971eb8 /drivers/gpu/drm/exynos/exynos_hdmi.c | |
| parent | drm/exynos/hdmi: replace all writeb with writel (diff) | |
| download | kernel-qcow2-linux-2445c4a44f200a3137dbaaa3603f2f095c9fdd45.tar.gz kernel-qcow2-linux-2445c4a44f200a3137dbaaa3603f2f095c9fdd45.tar.xz kernel-qcow2-linux-2445c4a44f200a3137dbaaa3603f2f095c9fdd45.zip | |
drm/exynos/hdmi: fix removal order
DRM device should be destroyed before releasing resources.
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_hdmi.c')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_hdmi.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 50ced7091c83..725ddb58a624 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -2046,15 +2046,17 @@ 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); if (hdata->hdmiphy_port) put_device(&hdata->hdmiphy_port->dev); - put_device(&hdata->ddc_adpt->dev); - pm_runtime_disable(&pdev->dev); - component_del(&pdev->dev, &hdmi_component_ops); + put_device(&hdata->ddc_adpt->dev); return 0; } |