From 30948dc13f177fb03375f797944229f27f3aea1d Mon Sep 17 00:00:00 2001 From: Algea Cao Date: Thu, 3 Jan 2019 10:50:33 +0800 Subject: [PATCH] drm: bridge: dw-hdmi: Check whether hdmi is initialized when hdmi suspend or resume Hdmi suspend or resume may be called before hdmi initialization. We must verify that hdmi is initialized first. Change-Id: I2a680209e64b9c1aebc2d9ee19d543927137afd0 Signed-off-by: Algea Cao --- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index 2c5dd47c489e..b7890bcb3547 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -3900,6 +3900,11 @@ void dw_hdmi_suspend(struct device *dev) { struct dw_hdmi *hdmi = dev_get_drvdata(dev); + if (!hdmi) { + dev_warn(dev, "Hdmi has not been initialized\n"); + return; + } + mutex_lock(&hdmi->mutex); /* @@ -3927,6 +3932,11 @@ void dw_hdmi_resume(struct device *dev) { struct dw_hdmi *hdmi = dev_get_drvdata(dev); + if (!hdmi) { + dev_warn(dev, "Hdmi has not been initialized\n"); + return; + } + pinctrl_pm_select_default_state(dev); mutex_lock(&hdmi->mutex); dw_hdmi_reg_initial(hdmi);