From patchwork Mon Jul 12 06:09:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 472919 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2661870jao; Sun, 11 Jul 2021 23:52:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwsyXNPvCkkXNbFB5ivVSFt75vMAt1V0pw67ntAybwIAgti1HCcqSkmmSHCVwI2Yjg187Vl X-Received: by 2002:a17:906:26d3:: with SMTP id u19mr3833582ejc.172.1626072653294; Sun, 11 Jul 2021 23:50:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626072653; cv=none; d=google.com; s=arc-20160816; b=BrueWI8pmoXvByK4mkKNNsi4mM1G2wJCW6zt0kfR1jAed1q9nadCskDrh6sTcvHZer pLgu9arpLFZLGr70x/1++ziZ8Nn3Pq7IEnAil3CN/LWurVesNAZDgdQpC3Zm/j++qPIi qjQp0quWdMJB4jyXKN9vMsGBKGLbz2vCZq/JfiISfjTs3b/xip/fedrqbObgSTM0WREU OEbPqFnMFXYhATETGyYscQPK1IF5R0RGMQ4wZTong2McPvkM0KX77gLpt20uL/pCPNqn W9+snf51qNAY37XDoKNJ6swgFaTRA3pQy7ruVOrNYrN/lKkoOZL0bSVPpY0q3ic+rASO dnxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1V+LL5zt4d2bSNsd47Qa84cvOnjcv4tn4EVEG2a+StE=; b=tD211moeETN/VJiMruBqguGpz0/ZmaEgdY62QDgx2kHulY17UChfRKjmMLjpglgNMC YjgjI64FJ0HnWP9ontsA6HE08G6sbnmm6fcaxCXgduL5IiaQ+WQHzwpb1xpXFv1ojS0B G/72SV1ptjaLo4oqw6Gx3O9CoFzxKBF2U1YmfKUzRegadiZDIxbtZAEhzXTTFTuQOfs+ 5riGlm66EVT/JNA7KXETrXwiG6WjC5lDUE/CpLu87iLuvo1tqPdQZMzhrPO0xrKTdZcb B2mk5nL7NggYqdaw8WoRzfCMz3sd89xQz+5DijV8whIF/UG2eiPXuuu1tkFVcb9nAgMr xhxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=urTBMCGy; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r25si3440466edp.437.2021.07.11.23.50.53; Sun, 11 Jul 2021 23:50:53 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=urTBMCGy; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239652AbhGLGw5 (ORCPT + 12 others); Mon, 12 Jul 2021 02:52:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:48250 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238021AbhGLGtG (ORCPT ); Mon, 12 Jul 2021 02:49:06 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3CC2561185; Mon, 12 Jul 2021 06:44:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072285; bh=U8qX7rLZG5FeDrJEnL+vbRTenG7k4myYULFhxlSmmtc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=urTBMCGyVVKYHUHqqcoZ1DRFb+mxkHYUv6NJ58Nafh2pNuXbOdM2b/MsKEvS++kIe R8JwuKd1ix3MvkYGVPzG9vlMcqbhxLqktCP0so3MEB+fEJ1YJYwmszLMyViV7IvhkR peihHgaYyk2JTbO4QOLjyXmzevxiewPPYfeGL6Zk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Zhen Lei , Stephen Boyd , Dmitry Baryshkov , Rob Clark , Sasha Levin Subject: [PATCH 5.10 390/593] drm/msm/dpu: Fix error return code in dpu_mdss_init() Date: Mon, 12 Jul 2021 08:09:10 +0200 Message-Id: <20210712060930.139740936@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060843.180606720@linuxfoundation.org> References: <20210712060843.180606720@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhen Lei [ Upstream commit e020ac961ce5d038de66dc7f6ffca98899e9a3f3 ] The error code returned by platform_get_irq() is stored in 'irq', it's forgotten to be copied to 'ret' before being returned. As a result, the value 0 of 'ret' is returned incorrectly. After the above fix is completed, initializing the local variable 'ret' to 0 is no longer needed, remove it. In addition, when dpu_mdss_init() is successfully returned, the value of 'ret' is always 0. Therefore, replace "return ret" with "return 0" to make the code clearer. Fixes: 070e64dc1bbc ("drm/msm/dpu: Convert to a chained irq chip") Reported-by: Hulk Robot Signed-off-by: Zhen Lei Link: https://lore.kernel.org/r/20210510063805.3262-2-thunder.leizhen@huawei.com Reviewed-by: Stephen Boyd Reviewed-by: Dmitry Baryshkov Signed-off-by: Dmitry Baryshkov Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 2.30.2 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c index 3416e9617ee9..96f3908e4c5b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c @@ -222,7 +222,7 @@ int dpu_mdss_init(struct drm_device *dev) struct msm_drm_private *priv = dev->dev_private; struct dpu_mdss *dpu_mdss; struct dss_module_power *mp; - int ret = 0; + int ret; int irq; dpu_mdss = devm_kzalloc(dev->dev, sizeof(*dpu_mdss), GFP_KERNEL); @@ -250,8 +250,10 @@ int dpu_mdss_init(struct drm_device *dev) goto irq_domain_error; irq = platform_get_irq(pdev, 0); - if (irq < 0) + if (irq < 0) { + ret = irq; goto irq_error; + } irq_set_chained_handler_and_data(irq, dpu_mdss_irq, dpu_mdss); @@ -260,7 +262,7 @@ int dpu_mdss_init(struct drm_device *dev) pm_runtime_enable(dev->dev); - return ret; + return 0; irq_error: _dpu_mdss_irq_domain_fini(dpu_mdss);