From patchwork Tue Sep 8 15:25:56 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: 249311 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp4777025ilg; Tue, 8 Sep 2020 11:06:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+uKW1yOHkWAtLAW30e4b3QhCUrp95H4LfP6QF0tEOgsOFgtw9n3tsZssDTwQAiAxdDb0i X-Received: by 2002:a17:906:770c:: with SMTP id q12mr21750124ejm.518.1599588373285; Tue, 08 Sep 2020 11:06:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599588373; cv=none; d=google.com; s=arc-20160816; b=GErvJOXuQDeRu3NpQ+CGQLdtmAErEdDQz94Vqehq51kDoybC0PFpia8Vcc3w6TmJ5e pyancMTrdpo2O8UnNRY/BLBy4Pg85E1bzLnjFdAzxDVyGISb0gQ479iFLFjmwaq5GCjC VThNudcUhKs9Ibz9C1VuOhFKpAeNo+W1wY5tzm8Ck1uR/SP0JiKhY4ef2m3bRxrylxaB 1BgPYHJafIPDsbg7s7sQ/e+ekPhalJC/e7lCeEKOqKyHByou8gDRXvtrGtl9fawtVsBt 2+LSGltd818YBO/aU84OfSVT+2wg2Uuuc6ntdaaGzylD5VgimtMIrNEHhI+h51XTQaVC BOQA== 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=vrW+nmjcLl5ZOJRRBczAWh6I1DMb2C4ZURXBmzd2/RYEPlJtfcy0SnJeQBQbcpOjQ3 hTYOXnY+FVd2JtOp1aCl1iFblQByrwod1jze6gZmmv6XPv9jTce/Ivx8sNa8rkF8FF0G gClGqtcLnSW5I9cjGwhGNTqLTpxN0r5UvJbeUWM8HBZsuGZ4ubRPO1bhCXXeZH32qP8M k48P89Llh1bd25hfeWm4qixYEgHZWAonzKBljLK1WsJS6MF6UgZ9tOeLZuZthb8KHOfl AOFg8p+9lk4fUnhG8i6oZ585n1kZd2WeSD415fNdOzVcGtkFc/G6GVNwUgYODKKvxcHd zPNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IKUjFZS0; 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 ch15si1836476ejb.52.2020.09.08.11.06.13; Tue, 08 Sep 2020 11:06:13 -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=IKUjFZS0; 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 S1726715AbgIHSGK (ORCPT + 15 others); Tue, 8 Sep 2020 14:06:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:56672 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731522AbgIHQMK (ORCPT ); Tue, 8 Sep 2020 12:12:10 -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 B7F5B2479F; Tue, 8 Sep 2020 15:51:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599580277; bh=Fwyb9jTCNk2q2vL/vLeKnXHtiCbmQM+AyT6SO048ZTU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IKUjFZS0aSBm1VbUoeyUg+pXmDr0AcDHzM9fApRIPlZGg/0XQUBt48xJXmPGlEAHy DOHnkz7o8oRcA7kKKwyHa3LTlui6fXM2KcQToQGrupOH7OHMIh6CzzIpYjzvnuwnJh D/G+69/aRtSlIZTYCFZ48ZQkUeWUNuTEZvk/MmL4= 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.14 11/65] dmaengine: of-dma: Fix of_dma_router_xlates of_dma_xlate handling Date: Tue, 8 Sep 2020 17:25:56 +0200 Message-Id: <20200908152217.605510752@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908152217.022816723@linuxfoundation.org> References: <20200908152217.022816723@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; } /*