Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88582f56 authored by Jeffy Chen's avatar Jeffy Chen Committed by Sean Paul
Browse files

drm/rockchip: cdn-dp: Don't unregister audio dev when unbinding 



After snd_soc_unregister_codec, the dai link would remain bound to
the invalid codec. That would cause crashes after unbind dp driver.

Let's unregister audio codec when removing dp driver to prevent that.

Signed-off-by: default avatarJeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1491481885-13775-7-git-send-email-jeffy.chen@rock-chips.com
parent 54bd1678

drivers/gpu/drm/rockchip/cdn-dp-core.c

+3 −3
Original line number Diff line number Diff line
@@ -1092,8 +1092,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];
@@ -1128,7 +1126,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);
@@ -1221,6 +1218,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);

}
@@ -1228,6 +1227,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);