From patchwork Mon Jul 20 15:35:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 237483 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp2112242ilg; Mon, 20 Jul 2020 09:06:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxt5ptB8dERzN1HuL426cbnyp1/oFYU5yNaXr/zLbafp1Gakenydviq6m7ZbKz868Es+J7J X-Received: by 2002:a05:6402:b10:: with SMTP id bm16mr22666240edb.92.1595261217831; Mon, 20 Jul 2020 09:06:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595261217; cv=none; d=google.com; s=arc-20160816; b=zOTzym4UA4+Avz94KkIhmIMI0s8AHmzj1XrUs2bQsdVQb72DX0YH3pRBqMffHBtKRb EFziYV5qe5zDh1JII0FAsPvQ4CHJoq2VZOyqRW8DUd6jhzNXfBZClBSWO1ZcYZ+P2GgO K46nIwxVBewohKvitRfTMemXIiKTsMXtEZNpzNLaoQRc9M2A2ulTj/4yWL99w21JmxnQ 5tVhFOWXroUm52BdiIXWS/5kn4Lnq9e7HuP4EgNOfaL/LVk5VlcKsW+9bdhpELtGynR3 w56odcXoGGOh4+UWkWrLC3zAXQTVWOBl0O9WwauVZmMTAypmQp7WK8uNJT/9HY/1YOfK vd8Q== 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=kFw4ZButEy1ErsCJ9r0bEyKqx50jPrFmSs+7GyNMMoWeHkzzAgYTd9GEWrbfYf5Mty cJUp3Od36wMv+VNHQEB9iGXq0yo8H/vwoEtBnfeNCl59qj6rCHhy1q/ju6CplIttXb4Q THpTaklxbkrQYEX9UMbpxwtgNgT4XPeLSPOCQIEkOCbXwrPgCo8Hd/xEar18qDrZt/O8 SPSvUdQeE6HuFbltCcAHbivBRI0QBd2UXFL2wR4sZsMz0eXqDSU0Y2uNA20OZciCEAf0 4BYa2OypfU52H1EvCzt3fu88QKT9oLwIyrstclyiPBqoyUYf6/+lfcOtzxnvfkdrigf8 sAxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="OBIIbe7/"; 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 b9si10656981edq.23.2020.07.20.09.06.57; Mon, 20 Jul 2020 09:06:57 -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="OBIIbe7/"; 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 S1731014AbgGTQGz (ORCPT + 15 others); Mon, 20 Jul 2020 12:06:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:43494 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732723AbgGTQGz (ORCPT ); Mon, 20 Jul 2020 12:06:55 -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 12AC32064B; Mon, 20 Jul 2020 16:06:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595261214; bh=B4KbhpoltGExd208/4xHgN1aUeY0aanpA2UIDqaA8Jk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OBIIbe7/hUtUirxhv+6OcVZAV/9x/laH66fsygEg2em42giMmt+t3Cy9SRrxqHfnF g+P+ew6XMbVyyilNdmlvyX/8e/1ZnQpgQb1FLbJofn8QUke6v8Ikdwpxof2CcXQOOU OOyN+2BrUc448tVZjpJS14RlJpIfrToPb3klRuYs= 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.7 034/244] drm/exynos: Properly propagate return value in drm_iommu_attach_device() Date: Mon, 20 Jul 2020 17:35:05 +0200 Message-Id: <20200720152827.488625929@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152825.863040590@linuxfoundation.org> References: <20200720152825.863040590@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; } /*