Commit 1bb7ab40 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Andrzej Hajda
Browse files

drm/bridge/lontium-lt9611uxc: fix get_edid return code 



Return NULL pointer from get_edid() callback rather than ERR_PTR()
pointer, as DRM code does NULL checks rather than IS_ERR(). Also while
we are at it, return NULL if getting EDID timed out.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Fixes: 0cbbd5b1 ("drm: bridge: add support for lontium LT9611UXC bridge")
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Reviewed-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210121233303.1221784-3-dmitry.baryshkov@linaro.org
parent 053b1b28

drivers/gpu/drm/bridge/lontium-lt9611uxc.c

+4 −1
Original line number Diff line number Diff line
@@ -505,7 +505,10 @@ static struct edid *lt9611uxc_bridge_get_edid(struct drm_bridge *bridge, 
	ret = lt9611uxc_wait_for_edid(lt9611uxc);

	if (ret < 0) {

		dev_err(lt9611uxc->dev, "wait for EDID failed: %d\n", ret);

		return ERR_PTR(ret);

		return NULL;

	} else if (ret == 0) {

		dev_err(lt9611uxc->dev, "wait for EDID timeout\n");

		return NULL;

	}



	return drm_do_get_edid(connector, lt9611uxc_get_edid_block, lt9611uxc);