From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> To: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org Cc: Jernej Skrabec <jernej.skrabec@siol.net>, Jonas Karlman <jonas@kwiboo.se>, David Airlie <airlied@linux.ie>, Neil Armstrong <narmstrong@baylibre.com>, Bjorn Andersson <bjorn.andersson@linaro.org>, Andrzej Hajda <a.hajda@samsung.com>, Vinod Koul <vkoul@kernel.org>, Laurent Pinchart <Laurent.pinchart@ideasonboard.com>, Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>, Sam Ravnborg <sam@ravnborg.org> Subject: [PATCH v4 2/3] drm/bridge/lontium-lt9611uxc: fix get_edid return code Date: Fri, 22 Jan 2021 02:33:02 +0300 Message-ID: <20210121233303.1221784-3-dmitry.baryshkov@linaro.org> (raw) In-Reply-To: <20210121233303.1221784-1-dmitry.baryshkov@linaro.org> 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: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Fixes: 0cbbd5b1a012 ("drm: bridge: add support for lontium LT9611UXC bridge") Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> --- drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c index a59e811f1705..b708700e182d 100644 --- a/drivers/gpu/drm/bridge/lontium-lt9611uxc.c +++ b/drivers/gpu/drm/bridge/lontium-lt9611uxc.c @@ -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); -- 2.29.2 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply index Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-21 23:33 [PATCH v4 0/3] drm/bridge/lontium-lt9611uxc: fix handling of EDID/HPD Dmitry Baryshkov 2021-01-21 23:33 ` [PATCH v4 1/3] drm/bridge/lontium-lt9611uxc: fix waiting for EDID to become available Dmitry Baryshkov 2021-01-22 9:27 ` Andrzej Hajda 2021-01-21 23:33 ` Dmitry Baryshkov [this message] 2021-01-22 9:28 ` [PATCH v4 2/3] drm/bridge/lontium-lt9611uxc: fix get_edid return code Andrzej Hajda 2021-01-21 23:33 ` [PATCH v4 3/3] drm/bridge/lontium-lt9611uxc: move HPD notification out of IRQ handler Dmitry Baryshkov 2021-01-22 9:34 ` Andrzej Hajda 2021-01-28 11:24 ` Andrzej Hajda
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210121233303.1221784-3-dmitry.baryshkov@linaro.org \ --to=dmitry.baryshkov@linaro.org \ --cc=Laurent.pinchart@ideasonboard.com \ --cc=a.hajda@samsung.com \ --cc=airlied@linux.ie \ --cc=bjorn.andersson@linaro.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=jernej.skrabec@siol.net \ --cc=jonas@kwiboo.se \ --cc=linux-arm-msm@vger.kernel.org \ --cc=manivannan.sadhasivam@linaro.org \ --cc=narmstrong@baylibre.com \ --cc=sam@ravnborg.org \ --cc=vkoul@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
dri-devel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/dri-devel/0 dri-devel/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dri-devel dri-devel/ https://lore.kernel.org/dri-devel \ dri-devel@lists.freedesktop.org public-inbox-index dri-devel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.freedesktop.lists.dri-devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git