From patchwork Tue Sep 8 15:25:16 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: 249357 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp4801316ilg; Tue, 8 Sep 2020 11:38:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxD7u2nceQiP0X0G/EGrt+Jk/8BBEroqfD3PO6Xq8T2IBONF/jkWQbI9z2NCEWqW6/04hnh X-Received: by 2002:a17:906:838f:: with SMTP id p15mr28488416ejx.315.1599590285444; Tue, 08 Sep 2020 11:38:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599590285; cv=none; d=google.com; s=arc-20160816; b=0OYeMhURg197mbxHlr6dIxGHeuDO+Aml2KhB8D4VV+zls/mjH8t0vYX5nSQTdQNpxK yTzVgEFBM3QZbASFvXAqCSKpFWzoxsnWW17hsZW6JN40BG5UjPh7f7BAqpN06vsAi7me Nsc0I3Y8SbcdwwMd5ykbBWjYNQc2xIzVAnFZOKHm+yr0u+Ey/rahv1UGW6XijX0p8pwX KmbdKHNiWe5PA/qwTfNSxv5q9slPClIlPre4blLW4yWgGgwNyOksnNSt372ncO/Zhdf2 WzZD0ww0GvrZ4iX/wlPfDh3b68eVjYxDANLa5xubHX+sT0BrkkRkKCYfAnm0yhQmP6Qz dQbw== 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=2sRoSTW/W8q9JA+gWMKT1m+yp93y10NmQfhVAv21pnY=; b=c6QeH9gh+hRdB1Jy8aTZ7a5Yk0Wh6DBABH+KAaiDRz0x6yAW7NrZwSqQ7Q20f/s2AT VOkSPxrVEeec058/G508XCvSneJv8v0oq5LIU9Y+iqNA8e6htLCw24++rxKBD+aWNnPm 9ku5wLVriccbKhGEZC3KbvTw3Gb6Uo6wnrQE9f5R5QbIM2IfMcA3s3jvwv36gMwnuDs5 zt3cBlh9WIBM/6poqSBcPJ2XcX5w3DABEdlkOXbOqgCgiE6hb5g2F9ry1PVKiEMBqSsc N9RAbJjWn2bC0ZdyYZFhJV7DJXoS5dxv2IlmWGIeB8hRa5WpaawSBp6CG3DPq/2UlhYp AJkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QgbV99uf; 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 m25si5756710ejb.269.2020.09.08.11.38.05; Tue, 08 Sep 2020 11:38:05 -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=QgbV99uf; 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 S1731670AbgIHShn (ORCPT + 15 others); Tue, 8 Sep 2020 14:37:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:53448 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731338AbgIHQJA (ORCPT ); Tue, 8 Sep 2020 12:09:00 -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 55ECD24117; Tue, 8 Sep 2020 15:48:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599580138; bh=Fwyb9jTCNk2q2vL/vLeKnXHtiCbmQM+AyT6SO048ZTU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QgbV99ufMn6h1pmJ2HuxW3QEceUsKqjnFid52PgldqV1BbOUgL/IoMadEQBW1HSAf m1TqBo1gfaTlMuzaVjZ9ZR592Q9ru8f53czL7EkIiP6vkSqRj3d6cfRhUBqFCuP1ya dUwHwVqyUPU4VSV1TAuKxVwPLhK+vNqF+2H3tv8c= 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.19 15/88] dmaengine: of-dma: Fix of_dma_router_xlates of_dma_xlate handling Date: Tue, 8 Sep 2020 17:25:16 +0200 Message-Id: <20200908152221.843032700@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908152221.082184905@linuxfoundation.org> References: <20200908152221.082184905@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 91fd395c90c4c..8344a60c2131b 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; } /*