From patchwork Tue Sep 8 15:24:23 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: 249348 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp4792837ilg; Tue, 8 Sep 2020 11:26:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzoneBwAMHWbVUtf2GYZqKcMZI9uLzF97rjer5hRD0/OrVqL9PPrZjs7PSGsu+wMg98YUY5 X-Received: by 2002:a50:fe0f:: with SMTP id f15mr250471edt.235.1599589562207; Tue, 08 Sep 2020 11:26:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599589562; cv=none; d=google.com; s=arc-20160816; b=LJ5WP9xpQDteJj7qCN+G1kYJj1VR1zErGF2fTtXx72hahsjCyOdYeNZnbt7iuWYRBP OpH/8dMQYwNH9ZGxmaIRs5C3YYCfFV0pTFWWgHRyDB4sAhxUFfZYnIKuEEvHlRdv7LB1 kXcvmm63Kk9cZ9JtF1mfXx2pZQnTOEQy/Cmiig5xFDE8YYAhH1VXOMKdlDG74XswJJef vArx5rkLG2+TpRxGepXmaB51nY4SYJRDcKs6/FgArhnzuhuK5P00r9ChVk+GhiPR2BiW zbSLXeJJYgv+UFXuqPGWSPrWeTSuX7sz8+2duV9lA+WFtt7eRCDKlTVXpRB/1wds+L3f P/7A== 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=80flr+dOplB/U4LdyREhYdrFxMg/2EIZROv31X315ww=; b=ghCNlUFnPR6YjERjs79f3ZaAtLFpyxZS7ulKMkFzIGkIs8kyA8o8w00klWT8FcNhKb lRv9OOJIXQ1MOyYYCAuyyN+vASGBmD+n10dpRqPEDsgperHEYJoLNpwivTcICFgf/Ybp BfB1IfY0vYIe7khR6j680FpYgLb6Lbf0YcslpzqejDVetphApqmWO5pgyIo3jnb3AyiD Mh1qkCaHjfa73B3AQytc1xy+BCMRolUU43nw8cQwHThctx0yKWjXWyShn0I091mKzsXD oRiMlms0GLaxAl9jNr1kBc76kbySSZavA5UZ9HfhGKdbQO8vUfAKSaXd1txTtF3gWZx+ MViw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ywErtKgh; 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 v15si11947393edw.67.2020.09.08.11.26.01; Tue, 08 Sep 2020 11:26:02 -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=ywErtKgh; 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 S1731791AbgIHSUJ (ORCPT + 15 others); Tue, 8 Sep 2020 14:20:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:56080 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731466AbgIHQLL (ORCPT ); Tue, 8 Sep 2020 12:11:11 -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 59251247E6; Tue, 8 Sep 2020 15:42:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599579756; bh=u/PWZb7114iK1yOzgf7Cmth9CCerX2WYzrhq1M1BPqk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ywErtKghSksULK11KWhR5ggbjJ8m/a8fvCyDfd54rG4ty2WOO7FngXE1Ki1uFss/y 5dXwV8QEn/HqvrRlfjL6mRATJ1I8hGEjxwxihpuaqd7/hcsQLcPibB/j2dpUiRP5EN llEjcfHG5j8TaU2c5OtejDPu1gWtu/FBY3BEzE+8= 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 5.4 022/129] dmaengine: of-dma: Fix of_dma_router_xlates of_dma_xlate handling Date: Tue, 8 Sep 2020 17:24:23 +0200 Message-Id: <20200908152230.812631778@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908152229.689878733@linuxfoundation.org> References: <20200908152229.689878733@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 c2d779daa4b51..4bbf4172b9bf9 100644 --- a/drivers/dma/of-dma.c +++ b/drivers/dma/of-dma.c @@ -69,12 +69,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; } /*