diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2019-03-28 17:31:30 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-10 17:53:09 +0200 |
commit | b3e867252f10b13af4d591211bb3d5119bc762fb (patch) | |
tree | 01fb68ab7c8811b8cef09af89cfcc41d07165eb2 | |
parent | 906d79143057cbd78f35db2e1175417c6a2d8869 (diff) | |
download | linux-stable-b3e867252f10b13af4d591211bb3d5119bc762fb.tar.gz linux-stable-b3e867252f10b13af4d591211bb3d5119bc762fb.tar.bz2 linux-stable-b3e867252f10b13af4d591211bb3d5119bc762fb.zip |
drm/mediatek: Fix an error code in mtk_hdmi_dt_parse_pdata()
[ Upstream commit 2d85978341e6a32e7443d9f28639da254d53f400 ]
We don't want to overwrite "ret", it already holds the correct error
code. The "regmap" variable might be a valid pointer as this point.
Fixes: 8f83f26891e1 ("drm/mediatek: Add HDMI support")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: CK Hu <ck.hu@mediatek.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r-- | drivers/gpu/drm/mediatek/mtk_hdmi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c index aba27ea9cea5..a33a1918463d 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c @@ -1473,7 +1473,6 @@ static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi, if (IS_ERR(regmap)) ret = PTR_ERR(regmap); if (ret) { - ret = PTR_ERR(regmap); dev_err(dev, "Failed to get system configuration registers: %d\n", ret); |