From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D90DAC04AB1 for ; Thu, 9 May 2019 19:05:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9B3752177E for ; Thu, 9 May 2019 19:05:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557428712; bh=sjNQ5IgPNKUyGx6RJsA8iWeENSdeFmBwhTuFKrrrZ3U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sj+GKxt+r9CyIgcwiupbBLK5P9o37YWFc1IPsA7JXZe0DZ17refElonUUhOwwRHy7 yLp2F7DEihtSqE1nT9FWhpYTkEHH3WrFYpY6fKtwTT1CpSOiVGJAnOR4SmTNaVnuC1 UIa7upbyUo2SIkqlz94/Vsl0z/8fXwQnm+NDkCag= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727883AbfEITFL (ORCPT ); Thu, 9 May 2019 15:05:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:40700 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727915AbfEISr6 (ORCPT ); Thu, 9 May 2019 14:47:58 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7F169217D7; Thu, 9 May 2019 18:47:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557427678; bh=sjNQ5IgPNKUyGx6RJsA8iWeENSdeFmBwhTuFKrrrZ3U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zGmDrTmLjxoEmFp84HhNIoBWT7jDoI4Db1771qJRcS/O1d4PtSVMrTaJsFuRjIpcV VMV8QT7GuA2T05B9YyjoAVcpCLz9cgsiYV93qXV/OrRzJJ/VXvVhzymMs5VobYWaVu Bbd2KgAERmA37OrBBU0K2fc9Ybm/1iQaeaSiebjM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , CK Hu , Sasha Levin Subject: [PATCH 4.19 28/66] drm/mediatek: Fix an error code in mtk_hdmi_dt_parse_pdata() Date: Thu, 9 May 2019 20:42:03 +0200 Message-Id: <20190509181304.853099638@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190509181301.719249738@linuxfoundation.org> References: <20190509181301.719249738@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ 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 Signed-off-by: CK Hu Signed-off-by: Sasha Levin --- 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 643f5edd68fe3..c7a77d6f612b2 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.20.1