Skip to content

Commit e40945a

Browse files
committed
drm/vc4: hdmi: Unregister codec device on unbind
On bind we will register the HDMI codec device but we don't unregister it on unbind, leading to a device leakage. Unregister our device at unbind. Signed-off-by: Maxime Ripard <maxime@cerno.tech> Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220127111452.222002-1-maxime@cerno.tech
1 parent 439cf34 commit e40945a

2 files changed

Lines changed: 9 additions & 0 deletions

File tree

drivers/gpu/drm/vc4/vc4_hdmi.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1749,6 +1749,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi)
17491749
dev_err(dev, "Couldn't register the HDMI codec: %ld\n", PTR_ERR(codec_pdev));
17501750
return PTR_ERR(codec_pdev);
17511751
}
1752+
vc4_hdmi->audio.codec_pdev = codec_pdev;
17521753

17531754
dai_link->cpus = &vc4_hdmi->audio.cpu;
17541755
dai_link->codecs = &vc4_hdmi->audio.codec;
@@ -1788,6 +1789,12 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi)
17881789

17891790
}
17901791

1792+
static void vc4_hdmi_audio_exit(struct vc4_hdmi *vc4_hdmi)
1793+
{
1794+
platform_device_unregister(vc4_hdmi->audio.codec_pdev);
1795+
vc4_hdmi->audio.codec_pdev = NULL;
1796+
}
1797+
17911798
static irqreturn_t vc4_hdmi_hpd_irq_thread(int irq, void *priv)
17921799
{
17931800
struct vc4_hdmi *vc4_hdmi = priv;
@@ -2660,6 +2667,7 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master,
26602667
kfree(vc4_hdmi->hdmi_regset.regs);
26612668
kfree(vc4_hdmi->hd_regset.regs);
26622669

2670+
vc4_hdmi_audio_exit(vc4_hdmi);
26632671
vc4_hdmi_cec_exit(vc4_hdmi);
26642672
vc4_hdmi_hotplug_exit(vc4_hdmi);
26652673
vc4_hdmi_connector_destroy(&vc4_hdmi->connector);

drivers/gpu/drm/vc4/vc4_hdmi.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ struct vc4_hdmi_audio {
116116
struct snd_soc_dai_link_component platform;
117117
struct snd_dmaengine_dai_dma_data dma_data;
118118
struct hdmi_audio_infoframe infoframe;
119+
struct platform_device *codec_pdev;
119120
bool streaming;
120121
};
121122

0 commit comments

Comments
 (0)