aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2011-12-22 09:17:40 -0500
committerOlof Johansson <olof@lixom.net>2012-02-06 21:24:58 -0500
commit13ae3d5bdf737d6078a562154ff4fef0ba5d0de1 (patch)
treef6a5e78c700a5aecfd9c6f754de75cb6ffbd5b97
parent07d4563e58dea39923456939e7d4138fb608b98b (diff)
ARM: tegra: Don't WARN_ON() for too early dma channel allocations
Since we'll do opportunistic allocations before the dma subsystem is enabled we want just silent failures and retries instead. Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/mach-tegra/dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/dma.c b/arch/arm/mach-tegra/dma.c
index c0cf967e47d3..98b33c89b2c5 100644
--- a/arch/arm/mach-tegra/dma.c
+++ b/arch/arm/mach-tegra/dma.c
@@ -357,7 +357,7 @@ struct tegra_dma_channel *tegra_dma_allocate_channel(int mode)
357 int channel; 357 int channel;
358 struct tegra_dma_channel *ch = NULL; 358 struct tegra_dma_channel *ch = NULL;
359 359
360 if (WARN_ON(!tegra_dma_initialized)) 360 if (!tegra_dma_initialized)
361 return NULL; 361 return NULL;
362 362
363 mutex_lock(&tegra_dma_lock); 363 mutex_lock(&tegra_dma_lock);