From patchwork Mon Jul 20 15:35:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 237548 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp2132443ilg; Mon, 20 Jul 2020 09:31:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyfMCXdeo7S25KuayTGkn99fiuFy3o5k2Je2nwddK6sbmwD+R8XDqA16lG9KRieYM2DUQMK X-Received: by 2002:a17:906:384a:: with SMTP id w10mr22440370ejc.235.1595262678224; Mon, 20 Jul 2020 09:31:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595262678; cv=none; d=google.com; s=arc-20160816; b=X7sxz6Qm3+Cr1Ulz/f4Ev6s/ADfcNS5B1WIK/EJjprcD8bf0IrOVg6LstWz8+skQP1 9M+l3tQwvEyhu5jCLYXrdI67Y+OyDR2FP57Y70e7HKhA5TO/tlUrqPl7Ll1znnHIF90u 3QyJKRtd3RIrxTDRWSrO6QN3IqMggupD0DvKG0udfB/G9Iovdq+bk3qpItsNGiVIV8jZ q/25yEdDdLEzxq/oaaYAr65pkdrl7jsEkrDnBNQgtNIUR5rpUamq2kKmsZQFEtyhbJJV tlAtxiuJvXBhYE5mB3rA6LKMqPh9dXsLC8V0hnRxFmdScwlnw+dtidLHxyBgQt+9tliK js2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OMmCnXHmN2ILvEh5wgtfRmO4LUerlNvY62aSFBd3j8g=; b=DPmj8HbZCd49/WxN9Q27GG7h7RZgncs0aptcM6Z4Kw/S2hx8TK3OMGv7vayaYWcRBx 4BxvuIXPz2Q3P6gBLT4tLiCi0+H+tfSaxzNzDyygPQ2257W6sGUwgdpV6yCHC+Cqo9eB UpFwOHHs2l28TtUF9amk+UZ+8baNhFiAPBnzre3eeWcLx7W/8XP0YV/UECIf1UwEyMI0 4oRJWecqy+AU0F8Od62stlNAfG08B6Q0F8H+rILw+3fKeg41KswjmhOi1D7whZcaV+9U oEL6qyO6qL3glCiJX/p4z5rX+3pNxsJsQOTbflUrfw13sRytaccFvOHN1Nhr3I5i7D1b 23jA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sRD2vhhZ; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a1si11610097edb.90.2020.07.20.09.31.04; Mon, 20 Jul 2020 09:31:18 -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=@kernel.org header.s=default header.b=sRD2vhhZ; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732581AbgGTQa4 (ORCPT + 15 others); Mon, 20 Jul 2020 12:30:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:57738 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730658AbgGTP5o (ORCPT ); Mon, 20 Jul 2020 11:57:44 -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 5955B20773; Mon, 20 Jul 2020 15:57:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595260663; bh=B4KbhpoltGExd208/4xHgN1aUeY0aanpA2UIDqaA8Jk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sRD2vhhZgl+U7SxuaH/SwIom4LjERtjr8wCYMkeNJNosfN/CVqjHjTANt17kH9H0d 8sA0S2zty5SGlpIaDFCc0twZxc5U9MngFw0KeZU87ZGFGurGeen3jsUXkKlYjKCRCg UOHfhuekHzhfA3jfVemDXocZbvKI5zev43dasico= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, kbuild test robot , Marek Szyprowski , Inki Dae , Sasha Levin Subject: [PATCH 5.4 032/215] drm/exynos: Properly propagate return value in drm_iommu_attach_device() Date: Mon, 20 Jul 2020 17:35:14 +0200 Message-Id: <20200720152821.713321911@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152820.122442056@linuxfoundation.org> References: <20200720152820.122442056@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marek Szyprowski [ Upstream commit b9c633882de4601015625f9136f248e9abca8a7a ] Propagate the proper error codes from the called functions instead of unconditionally returning 0. Reported-by: kbuild test robot Signed-off-by: Marek Szyprowski Merge conflict so merged it manually. Signed-off-by: Inki Dae Signed-off-by: Sasha Levin --- drivers/gpu/drm/exynos/exynos_drm_dma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.25.1 diff --git a/drivers/gpu/drm/exynos/exynos_drm_dma.c b/drivers/gpu/drm/exynos/exynos_drm_dma.c index 619f81435c1b2..58b89ec11b0eb 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dma.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dma.c @@ -61,7 +61,7 @@ static int drm_iommu_attach_device(struct drm_device *drm_dev, struct device *subdrv_dev, void **dma_priv) { struct exynos_drm_private *priv = drm_dev->dev_private; - int ret; + int ret = 0; if (get_dma_ops(priv->dma_dev) != get_dma_ops(subdrv_dev)) { DRM_DEV_ERROR(subdrv_dev, "Device %s lacks support for IOMMU\n", @@ -92,7 +92,7 @@ static int drm_iommu_attach_device(struct drm_device *drm_dev, if (ret) clear_dma_max_seg_size(subdrv_dev); - return 0; + return ret; } /*