From patchwork Tue Sep 8 15:23:01 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: 249365 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp4833092ilg; Tue, 8 Sep 2020 12:23:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxB1FzbtN6fcq0QkzCHUKjWKVZe9u/RPQUZBZ46Bih0F6g2Gr60fmzwjm7g3KAF3mFlsnDW X-Received: by 2002:aa7:d88a:: with SMTP id u10mr532628edq.217.1599593015620; Tue, 08 Sep 2020 12:23:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599593015; cv=none; d=google.com; s=arc-20160816; b=H0DjAVlmzWAOekFqdqZZmhI3tR61mMf5xZvTfzAn0OnY1NtDv1dv1R2JlcaXltFQl3 nMaVO/VZYRer0F24RHy6vHLPgsCq4pL4FvYlwrApYo5Wji8KDFClacJZV/bUlMZcVenm CU56T9WdlB6ul+6JsLalWWTg0751R/UreMJgbOySzVz0Khw5RdYAF+YElEm6OOObzEM7 UnWxhyYoFFkvwD3UwsfHYjnt/mjm6oJeWoBVWZXhRp0TNSS8lD2MGJJ+CAsf7UimdCBy S4utY/ZbWOOj/5SzCwa3cHzXtxRjv5zcpuUr+0CA3Fh9CrLtKAPypvGO0YIynlpUrQnz znhQ== 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=wzrbR7afwhvLTMMuu6DS7j1P3a4X8UBMnzWaPvPKMZI=; b=fYX2S7i/owSiQF3lSOqL72t65atrpD4MZk1CPaomKvyRDhCMFNygImwyC7I2C6wmA8 TpKRYyia4Du45aHmEXxsY/FAfsPOQGRDVSJct4IixvuATTmvDcvsDnXyl97rdgFUvr4h nPfacgz4xB1Wjes4gMej/ln9+c3Hjpwzd8MT7YsY9te+jZSgwqMHTk/cfExfVLzAsS2j U+xg3Pd9UFnU2xBwsJaWS2qWMzGrGGqyA82liRzCx2Z2qGJHRMAkM0mlKKFU91m3l9Uy DWuCxLAnOd4LkT3nevNbBVrkLVm7EeGXlEUAkA9YnCqKCUslIO6oaz0mry/ZxIGYB/1A lznA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MrUoCgFd; 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 mh25si12565046ejb.568.2020.09.08.12.23.35; Tue, 08 Sep 2020 12:23:35 -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=MrUoCgFd; 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 S1732031AbgIHTXD (ORCPT + 15 others); Tue, 8 Sep 2020 15:23:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:47734 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731027AbgIHQBa (ORCPT ); Tue, 8 Sep 2020 12:01:30 -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 0C46122475; Tue, 8 Sep 2020 15:35:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599579346; bh=FScIIQCfDvrdbY6eW+klNoICJVab0zsHLHoW1aD2bR4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MrUoCgFdnEQllzpxTVLt+JsrKmdybHCL9/1juYpguQhIEP6Ue/oR7H6NZVgh3OmXG 1mJnG14mmdN6fEBuVeoKYci/DzTlfyEDTUH5BPZ+ZOsi7H6dsgOaLt7EdGw6Vv2uML 8DRmNyPNVdJ21TSjWYnYoZKXpK7os3z0fEhUtFV0= 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.8 039/186] dmaengine: of-dma: Fix of_dma_router_xlates of_dma_xlate handling Date: Tue, 8 Sep 2020 17:23:01 +0200 Message-Id: <20200908152243.567472117@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908152241.646390211@linuxfoundation.org> References: <20200908152241.646390211@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 b2c2b5e8093cf..0db816eb8080d 100644 --- a/drivers/dma/of-dma.c +++ b/drivers/dma/of-dma.c @@ -71,12 +71,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; } /*