diff options
author | Mark Brown <broonie@kernel.org> | 2018-06-27 14:34:10 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-06-27 14:34:10 +0100 |
commit | eed41b9f413f40183095d27ffc94fb942fe18bb6 (patch) | |
tree | 0a28112db2410e9ae7586343895079d470121599 /drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | |
parent | 698f8bc0bacea1351db9de6f247e6922fb4d7f80 (diff) | |
parent | 1ce34dea91ae86bb18f493f72292df1bf6f66df7 (diff) |
Merge branch 'linux-linaro-lsk-v4.14' into linux-linaro-lsk-v4.14-rtlsk-v4.14-18.06-rt
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/hdmi4_core.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c index c3453f3bd603..1359bf50598f 100644 --- a/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c +++ b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c @@ -926,8 +926,13 @@ int hdmi4_core_init(struct platform_device *pdev, struct hdmi_core_data *core) { const struct hdmi4_features *features; struct resource *res; + const struct soc_device_attribute *soc; - features = soc_device_match(hdmi4_soc_devices)->data; + soc = soc_device_match(hdmi4_soc_devices); + if (!soc) + return -ENODEV; + + features = soc->data; core->cts_swmode = features->cts_swmode; core->audio_use_mclk = features->audio_use_mclk; |