Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1614448
| From | Jeffy Chen <jeffy.chen@rock-chips.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 9/9] drm/rockchip: cdn-dp: Don't unregister audio dev when unbinding |
| Date | 2017-04-01 12:50 +0200 |
| Message-ID | <troLw-1qN-29@gated-at.bofh.it> (permalink) |
| References | <troLv-1qN-9@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
In current sound framework, there's no way to unbind dai link after
unregister codec.
So don't unregister the codec when unbinding for now.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
drivers/gpu/drm/rockchip/cdn-dp-core.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index a97f3f4..1deab9f 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -1091,8 +1091,6 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
goto err_free_connector;
}
- cdn_dp_audio_codec_init(dp, dev);
-
for (i = 0; i < dp->ports; i++) {
port = dp->port[i];
@@ -1127,7 +1125,6 @@ static void cdn_dp_unbind(struct device *dev, struct device *master, void *data)
struct drm_connector *connector = &dp->connector;
cancel_work_sync(&dp->event_work);
- platform_device_unregister(dp->audio_pdev);
cdn_dp_encoder_disable(encoder);
encoder->funcs->destroy(encoder);
connector->funcs->destroy(connector);
@@ -1220,6 +1217,8 @@ static int cdn_dp_probe(struct platform_device *pdev)
mutex_init(&dp->lock);
dev_set_drvdata(dev, dp);
+ cdn_dp_audio_codec_init(dp, dev);
+
return component_add(dev, &cdn_dp_component_ops);
}
@@ -1227,6 +1226,7 @@ static int cdn_dp_remove(struct platform_device *pdev)
{
struct cdn_dp_device *dp = platform_get_drvdata(pdev);
+ platform_device_unregister(dp->audio_pdev);
cdn_dp_suspend(dp->dev);
component_del(&pdev->dev, &cdn_dp_component_ops);
--
2.1.4
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 0/9] drm: rockchip: Fix rockchip drm unbind crash error Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-01 12:50 +0200 [PATCH 8/9] drm/rockchip: gem: Don't alloc/free gem buf before drm dev registered Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-01 12:50 +0200 [PATCH 1/9] drm: bridge: analogix: Detach panel when unbinding analogix dp Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-01 12:50 +0200 [PATCH 7/9] drm/rockchip: Force disable all crtc when unload Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-01 12:50 +0200 [PATCH 9/9] drm/rockchip: cdn-dp: Don't unregister audio dev when unbinding Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-01 12:50 +0200 [PATCH 4/9] drm/rockchip: cdn-dp: Don't try to release firmware when not loaded Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-01 12:50 +0200 [PATCH 6/9] drm/rockchip: Reoder unload sequence Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-01 12:50 +0200
csiph-web