diff options
| author | Erik Gilling <konkers@android.com> | 2010-09-01 13:43:01 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-10-06 16:28:24 -0700 |
| commit | a24d8369e6dee6c62cbc5ea37901932c76003133 (patch) | |
| tree | c162faa824c67249fa5866dfc23cea13aec831ee /arch/arm/mach-tegra/tegra_i2s_audio.c | |
| parent | b3661dcd2ea92ee1f81e64565e44d5afb32c9923 (diff) | |
[ARM] tegra: update i2s to use PTR_ERRless dma API
Change-Id: I4bfe6ef64688244ae1d6a380891c7d94e2e243e7
Signed-off-by: Erik Gilling <konkers@android.com>
Diffstat (limited to 'arch/arm/mach-tegra/tegra_i2s_audio.c')
| -rw-r--r-- | arch/arm/mach-tegra/tegra_i2s_audio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/tegra_i2s_audio.c b/arch/arm/mach-tegra/tegra_i2s_audio.c index 314bb0482d7f..65f1ec8a28fe 100644 --- a/arch/arm/mach-tegra/tegra_i2s_audio.c +++ b/arch/arm/mach-tegra/tegra_i2s_audio.c @@ -613,10 +613,10 @@ static int setup_dma(struct audio_driver_state *ads) BUG_ON(!ads->out.buf_phys); setup_dma_tx_request(&ads->out.dma_req, &ads->out); ads->out.dma_chan = tegra_dma_allocate_channel(TEGRA_DMA_MODE_ONESHOT); - if (IS_ERR(ads->out.dma_chan)) { + if (!ads->out.dma_chan) { pr_err("%s: could not allocate output I2S DMA channel: %ld\n", __func__, PTR_ERR(ads->out.dma_chan)); - rc = PTR_ERR(ads->out.dma_chan); + rc = -ENODEV; goto fail_tx; } @@ -627,10 +627,10 @@ static int setup_dma(struct audio_driver_state *ads) BUG_ON(!ads->in.buf_phys); setup_dma_rx_request(&ads->in.dma_req, &ads->in); ads->in.dma_chan = tegra_dma_allocate_channel(TEGRA_DMA_MODE_ONESHOT); - if (IS_ERR(ads->in.dma_chan)) { + if (!ads->in.dma_chan) { pr_err("%s: could not allocate input I2S DMA channel: %ld\n", __func__, PTR_ERR(ads->in.dma_chan)); - rc = PTR_ERR(ads->in.dma_chan); + rc = -ENODEV; goto fail_rx; } |