From patchwork Mon Jul 12 06:09:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 473028 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2710297jao; Mon, 12 Jul 2021 01:05:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKa5ggCz1VG64AU2ThNm1S6LlgPjGLzK4edUcU/eLEIQzYJ/eHgM/OMmJfBoooJSB4z4vU X-Received: by 2002:a05:6402:13c9:: with SMTP id a9mr454224edx.247.1626077146451; Mon, 12 Jul 2021 01:05:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626077146; cv=none; d=google.com; s=arc-20160816; b=pbk7ZxKQKBHLKpGOJvnlN28VShdXhetrLVnu+nrBmwpIgnXl5XTJEhHWraM/+3Kc5h MqVIouxbKtralm5ojGyL0f9ToTcC6OcRkAJGnRDzaxnrHIGZHUrnRgiQ/vmUvAqubQDn QzpaCJF8/4XOnRevszp3zlYowqd/suod06XHkGUlE51aipqynDDxeDsr0+9bYrA7q8NB elzRcjF50bX8HkT2eJOmA5TyQPS/5PnfkWl2KRrxZA7JJYt1vbUmqOkbo0uaI6Tla33W kxawPE+ceMle/eoX9H3i37N+WvyCJoB2Dh6xLbKk5h/eVKDtFOu90hfyjrmCZwsHVkZI 3s7w== 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=xWWTqY8pfcmJjxqc7fT96yqoZDMD5Uy0W+WSBuMW5Tg=; b=FnfOiv4Oa0lhmsoEde4unjlwyHVkK3HeKwOuRJ0VfBDxDLQTj9TLOtGYLeZN24CEuc /w1lVudhFTU+QuNRmSJSdOiGA5Nsc0dIda8eN5YcimIgowBXrN7qo5jsOxv/gz0w/hOT 9+uOxssrt6pwMrAek0ka6qf26e68wAeiWp032KqbKZsBTdpCQ43kWAR6GZbJOHddbZHU 0Ufoogn1ICFWjrcK55uCiHcmUVjEubqkY85AoYdEh/Y2TqMvzo7x7aEHzhUTETgO1wiM XNGD6BBi7+mCg+XuhhS1AhVWLvIi9Yrlq1lVinbdv2y6IkT1ScMMIg65JLOXLxka6+rv ZgHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JxHAm3u+; 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 n21si13642925eda.13.2021.07.12.01.05.45; Mon, 12 Jul 2021 01:05:46 -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=JxHAm3u+; 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 S1347655AbhGLH5P (ORCPT + 12 others); Mon, 12 Jul 2021 03:57:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:42138 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343893AbhGLHxP (ORCPT ); Mon, 12 Jul 2021 03:53:15 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 873C36113A; Mon, 12 Jul 2021 07:50:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626076226; bh=wYK27Z3DHnlFINY5028rasLj4gxCB/TAPCq7JCyk74U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JxHAm3u+0hTbLiEi3VbmQobXTu3yn80S9d1CZbffHp49LVRG0PGzkEfKCz+my8mZy JpuCnc98MVT9Vbg5Sja92pVOsiSQAkJ7J7O/yWqRv8IFP/7oXm0QhYTvXQOxfK+Ot9 QqxQawdK9ZhYERyyTaHoU3YsENZYDvsUIXChUvPk= 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.13 551/800] drm/msm/dpu: Fix error return code in dpu_mdss_init() Date: Mon, 12 Jul 2021 08:09:34 +0200 Message-Id: <20210712061026.005338614@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060912.995381202@linuxfoundation.org> References: <20210712060912.995381202@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 06b56fec04e0..6b0a7bc87eb7 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c @@ -225,7 +225,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); @@ -253,8 +253,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); @@ -263,7 +265,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);