summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/display
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2025-06-11 09:01:34 +0200
committerThomas Zimmermann <tzimmermann@suse.de>2025-06-11 09:01:34 +0200
commitc598d5eb9fb331ba17bc9ad67ae9a2231ca5aca5 (patch)
treea5b6f4655cde4f19b6b157aa455723c0329bd719 /drivers/gpu/drm/display
parent29a9b3a504c0d18bcc7f0547371409e9dcbc045e (diff)
parent19272b37aa4f83ca52bdf9c16d5d81bdd1354494 (diff)
downloadlinux-c598d5eb9fb331ba17bc9ad67ae9a2231ca5aca5.tar.gz
linux-c598d5eb9fb331ba17bc9ad67ae9a2231ca5aca5.tar.bz2
linux-c598d5eb9fb331ba17bc9ad67ae9a2231ca5aca5.zip
Merge drm/drm-next into drm-misc-next
Backmerging to forward to v6.16-rc1 Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/gpu/drm/display')
-rw-r--r--drivers/gpu/drm/display/drm_hdmi_audio_helper.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/display/drm_hdmi_audio_helper.c b/drivers/gpu/drm/display/drm_hdmi_audio_helper.c
index 21c93bdd8648..f165166afb2d 100644
--- a/drivers/gpu/drm/display/drm_hdmi_audio_helper.c
+++ b/drivers/gpu/drm/display/drm_hdmi_audio_helper.c
@@ -103,7 +103,8 @@ static int drm_connector_hdmi_audio_hook_plugged_cb(struct device *dev,
connector->hdmi_audio.plugged_cb = fn;
connector->hdmi_audio.plugged_cb_dev = codec_dev;
- fn(codec_dev, connector->hdmi_audio.last_state);
+ if (fn)
+ fn(codec_dev, connector->hdmi_audio.last_state);
mutex_unlock(&connector->hdmi_audio.lock);