Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751868AbbEYO7a (ORCPT ); Mon, 25 May 2015 10:59:30 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:33990 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751701AbbEYO6m (ORCPT ); Mon, 25 May 2015 10:58:42 -0400 From: Tomeu Vizoso To: linux-arm-kernel@lists.infradead.org Cc: =?UTF-8?q?St=C3=A9phane=20Marchesin?= , Thierry Reding , Dmitry Torokhov , Alexander Holler , Grant Likely , Rob Herring , Mark Rutland , Tomeu Vizoso , Vinod Koul , Dan Williams , dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 20/21] dma: of: Probe DMA controllers on demand Date: Mon, 25 May 2015 16:53:24 +0200 Message-Id: <1432565608-26036-21-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.4.1 In-Reply-To: <1432565608-26036-1-git-send-email-tomeu.vizoso@collabora.com> References: <1432565608-26036-1-git-send-email-tomeu.vizoso@collabora.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1110 Lines: 37 When looking up a DMA controller through its DT node, ensure that the corresponding device has been registered. Signed-off-by: Tomeu Vizoso --- drivers/dma/of-dma.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c index cbd4a8a..2bdb3da 100644 --- a/drivers/dma/of-dma.c +++ b/drivers/dma/of-dma.c @@ -17,6 +17,7 @@ #include #include #include +#include static LIST_HEAD(of_dma_list); static DEFINE_MUTEX(of_dma_lock); @@ -174,6 +175,8 @@ struct dma_chan *of_dma_request_slave_channel(struct device_node *np, if (of_dma_match_channel(np, name, i, &dma_spec)) continue; + of_platform_device_ensure(dma_spec.np); + mutex_lock(&of_dma_lock); ofdma = of_dma_find_controller(&dma_spec); -- 2.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/