diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2010-08-26 10:18:40 +0530 |
|---|---|---|
| committer | Bharat Nihalani <bnihalani@nvidia.com> | 2010-09-03 02:38:07 -0700 |
| commit | a537fc2dce58424510fc514eb499c544ae1ac96e (patch) | |
| tree | 10ad8fa3c1d05891940cfde93849c14134a33d4f /arch/arm/mach-tegra/nvrm/io/ap15/rm_spi_slink.c | |
| parent | 2349860b3df60934e6c04a8684cb51e6e1d39549 (diff) | |
[arm/tegra] dma: Dma allocation should be thread safe
The dma can be allocated from multiple client in run time
and so it should be thread/smp safe.
Returning proper error pointer in case of there is no dma to
allocate.
bug 723220
Change-Id: Ifb333d4b14e32be561e34a0d7668a2d631ac80c6
(cherry picked from commit db2d10f715fcdd6fdaf5fc7ea8e27a505f8332da)
Reviewed-on: http://git-master/r/5769
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Tested-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/nvrm/io/ap15/rm_spi_slink.c')
| -rw-r--r-- | arch/arm/mach-tegra/nvrm/io/ap15/rm_spi_slink.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/nvrm/io/ap15/rm_spi_slink.c b/arch/arm/mach-tegra/nvrm/io/ap15/rm_spi_slink.c index cf7fd9493820..26ee1e1a6457 100644 --- a/arch/arm/mach-tegra/nvrm/io/ap15/rm_spi_slink.c +++ b/arch/arm/mach-tegra/nvrm/io/ap15/rm_spi_slink.c @@ -57,7 +57,7 @@ #include "linux/module.h" #include "mach/dma.h" - +#include "linux/err.h" // Combined maximum spi/slink controllers #define MAX_SPI_SLINK_INSTANCE (MAX_SLINK_CONTROLLERS + MAX_SPI_CONTROLLERS) @@ -513,10 +513,10 @@ static NvError AllocateDmas(NvRmSpiHandle hRmSpiSlink) hRmSpiSlink->hTxDma = NULL; hRmSpiSlink->hRxDma = tegra_dma_allocate_channel(TEGRA_DMA_MODE_ONESHOT); - if (hRmSpiSlink->hRxDma) + if (!IS_ERR_OR_NULL(hRmSpiSlink->hRxDma)) { hRmSpiSlink->hTxDma = tegra_dma_allocate_channel(TEGRA_DMA_MODE_ONESHOT); - if (!hRmSpiSlink->hTxDma) + if (IS_ERR_OR_NULL(hRmSpiSlink->hTxDma)) { tegra_dma_free_channel(hRmSpiSlink->hRxDma); hRmSpiSlink->hRxDma = NULL; |