From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Dan Carpenter <dan.carpenter@oracle.com>,
CK Hu <ck.hu@mediatek.com>, Sasha Levin <sashal@kernel.org>,
dri-devel@lists.freedesktop.org
Subject: [PATCH AUTOSEL 4.9 07/16] drm/mediatek: Fix an error code in mtk_hdmi_dt_parse_pdata()
Date: Fri, 26 Apr 2019 21:43:15 -0400 [thread overview]
Message-ID: <20190427014325.8704-7-sashal@kernel.org> (raw)
In-Reply-To: <20190427014325.8704-1-sashal@kernel.org>
From: Dan Carpenter <dan.carpenter@oracle.com>
[ 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>
---
drivers/gpu/drm/mediatek/mtk_hdmi.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index 863d030786e5..200f75e1d619 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);
--
2.19.1
next prev parent reply other threads:[~2019-04-27 1:46 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-27 1:43 [PATCH AUTOSEL 4.9 01/16] ASoC: ab8500: Mark expected switch fall-through Sasha Levin
2019-04-27 1:43 ` [PATCH AUTOSEL 4.9 02/16] ASoC:soc-pcm:fix a codec fixup issue in TDM case Sasha Levin
2019-04-27 1:43 ` [PATCH AUTOSEL 4.9 03/16] ASoC: nau8810: fix the issue of widget with prefixed name Sasha Levin
2019-04-27 1:43 ` [PATCH AUTOSEL 4.9 04/16] ASoC: cs4270: Set auto-increment bit for register writes Sasha Levin
2019-04-27 1:43 ` [PATCH AUTOSEL 4.9 05/16] IB/hfi1: Eliminate opcode tests on mr deref Sasha Levin
2019-04-27 1:43 ` [PATCH AUTOSEL 4.9 06/16] ASoC: tlv320aic32x4: Fix Common Pins Sasha Levin
2019-04-27 1:43 ` Sasha Levin [this message]
2019-04-27 1:43 ` [PATCH AUTOSEL 4.9 08/16] perf/x86/intel: Fix handling of wakeup_events for multi-entry PEBS Sasha Levin
2019-04-27 1:43 ` [PATCH AUTOSEL 4.9 09/16] linux/kernel.h: Use parentheses around argument in u64_to_user_ptr() Sasha Levin
2019-04-27 1:43 ` [PATCH AUTOSEL 4.9 10/16] xtensa: fix initialization of pt_regs::syscall in start_thread Sasha Levin
2019-04-27 1:43 ` [PATCH AUTOSEL 4.9 11/16] scsi: csiostor: fix missing data copy in csio_scsi_err_handler() Sasha Levin
2019-04-27 1:43 ` [PATCH AUTOSEL 4.9 12/16] drm/mediatek: fix possible object reference leak Sasha Levin
2019-04-27 1:43 ` [PATCH AUTOSEL 4.9 13/16] virtio-blk: limit number of hw queues by nr_cpu_ids Sasha Levin
2019-04-27 1:43 ` [PATCH AUTOSEL 4.9 14/16] NFS: Forbid setting AF_INET6 to "struct sockaddr_in"->sin_family Sasha Levin
2019-04-27 1:43 ` [PATCH AUTOSEL 4.9 15/16] iommu/amd: Set exclusion range correctly Sasha Levin
2019-04-27 1:43 ` [PATCH AUTOSEL 4.9 16/16] mm: add 'try_get_page()' helper function Sasha Levin
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=20190427014325.8704-7-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=ck.hu@mediatek.com \
--cc=dan.carpenter@oracle.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox