| From foo@baz Sun Jun 17 12:07:34 CEST 2018 |
| From: Tomi Valkeinen <tomi.valkeinen@ti.com> |
| Date: Wed, 2 May 2018 12:11:56 +0300 |
| Subject: drm/omap: check return value from soc_device_match |
| |
| From: Tomi Valkeinen <tomi.valkeinen@ti.com> |
| |
| [ Upstream commit 4d6cb5e2fee52af17001e92950f0894304706ee4 ] |
| |
| soc_device_match() can return NULL, so add a check and fail if |
| soc_device_match() fails. |
| |
| Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20180502091159.7071-2-tomi.valkeinen@ti.com |
| Reviewed-by: Benoit Parrot <bparrot@ti.com> |
| Reviewed-by: Peter Ujfalusi <peter.ujfalusi@ti.com> |
| Signed-off-by: Sean Paul <seanpaul@chromium.org> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 7 ++++++- |
| 1 file changed, 6 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c |
| +++ b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.c |
| @@ -922,8 +922,13 @@ int hdmi4_core_init(struct platform_devi |
| { |
| 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; |
| |