From patchwork Fri Sep 11 12:45:53 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: 249730 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ecf:0:0:0:0 with SMTP id i15csp70616ilk; Fri, 11 Sep 2020 10:20:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGcu5QKV3NOc+lqwukElTcn65NlDiPKdChbyhx6//qr0M5eJ6JB5DBMIl0Tj+ykP6b5zKv X-Received: by 2002:a17:906:b784:: with SMTP id dt4mr3215039ejb.376.1599844840681; Fri, 11 Sep 2020 10:20:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599844840; cv=none; d=google.com; s=arc-20160816; b=BckxH1VQ1zOS8IBBDmzaP5OAleySqsxtz1Gzn1COmJCeGrCXnFklN8IsePu7ONILlO sYTMZPuCM0wK/Amo+N9Re3SRlxzP7pbWd8WVR8XKauyLFPRWDt/978NcGHIj/OqSud2X lT/RDZyMmD6eywMkjSuvdjvNkGqPiJDHaRF6CTW4stGHU+MhAOioBtBP2Hu0py9noAef ICQeyMMwqTxcyGjG0y/Fu+Ux/NxjnxTOSfvRsFYOXcgsFb7qhiScblYVUB6RepeUaoRE idEbhcgrNgo0Olb0Q1tJ3qsMNxclMl3xIii1DSUgwBrkb7Q78GhaEbUWUgCLPVJszARG ViLg== 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=//4+ifGva40X1tdbmeIhJr8oF8Ijwt0VXVzCOYiMfec=; b=p9PhFQ4iznrNm+jUu8S+7NmmQrBrdoJ7wAuFLzaplggxUg3Ee/xVhlxbyTeXampGpu D6CFRc2KnAeTQRB8aCnKYRXE2uj/8BUMofnw2JQpN9S61OZnPg8VHHyZe+WkIPgHnPe/ 7A/vr9LSKIZHMwuXVgNuCt8iFODxcCANeaOtYXXPAkF19TMVHk5QmMcC5pKay+Tlrug+ ExF+m8Xf2E7RnBSUNErsbMYIQCH8GWcDOfeX3uIdxIvV8Syqbb1v+XPrXmfs5JcSpiVT rIP3Ui2cD66svZlX7/LEjfieLwtXsc8hLbHM6mXGukX+mZQz/05+EfD36Aa4NDWFQVxn rgHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=YmIzWR9w; 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=fail (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 z3si1870011ejw.415.2020.09.11.10.20.40; Fri, 11 Sep 2020 10:20:40 -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=YmIzWR9w; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726120AbgIKRUF (ORCPT + 15 others); Fri, 11 Sep 2020 13:20:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:52806 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726174AbgIKNCU (ORCPT ); Fri, 11 Sep 2020 09:02:20 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 DADF62228A; Fri, 11 Sep 2020 12:57:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599829025; bh=Uxw6cXgBeqDxymezQx0zPIRkOo2m+9RuiWcnuHgg4IQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YmIzWR9wzQgCwyg2f4QrEljyNm5oIxg62bX3u8Uzuo5qDibsQ7S0RNntBm+HOl68Z dHnAZnV+z4x7aIX/y2wcP4afVX9tTJRazQhI76HLsT4WXgZchT/tQ6ErinocqFJGE5 rVpCYba2N8gv0YRGAD+9bq6ZnBtNdjuMEe58xvCw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Ujfalusi , Vinod Koul , Sasha Levin Subject: [PATCH 4.9 09/71] dmaengine: of-dma: Fix of_dma_router_xlates of_dma_xlate handling Date: Fri, 11 Sep 2020 14:45:53 +0200 Message-Id: <20200911122505.406607837@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200911122504.928931589@linuxfoundation.org> References: <20200911122504.928931589@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: Peter Ujfalusi [ Upstream commit 5b2aa9f918f6837ae943557f8cec02c34fcf80e7 ] of_dma_xlate callback can return ERR_PTR as well NULL in case of failure. If error code is returned (not NULL) then the route should be released and the router should not be registered for the channel. Fixes: 56f13c0d9524c ("dmaengine: of_dma: Support for DMA routers") Signed-off-by: Peter Ujfalusi Link: https://lore.kernel.org/r/20200806104928.25975-1-peter.ujfalusi@ti.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/of-dma.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.25.1 diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c index faae0bfe1109e..757cf48c1c5ed 100644 --- a/drivers/dma/of-dma.c +++ b/drivers/dma/of-dma.c @@ -72,12 +72,12 @@ static struct dma_chan *of_dma_router_xlate(struct of_phandle_args *dma_spec, return NULL; chan = ofdma_target->of_dma_xlate(&dma_spec_target, ofdma_target); - if (chan) { - chan->router = ofdma->dma_router; - chan->route_data = route_data; - } else { + if (IS_ERR_OR_NULL(chan)) { ofdma->dma_router->route_free(ofdma->dma_router->dev, route_data); + } else { + chan->router = ofdma->dma_router; + chan->route_data = route_data; } /*