diff options
| author | Iliyan Malchev <malchev@google.com> | 2010-10-15 14:13:48 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2010-10-16 19:56:22 -0700 |
| commit | 810694cfa9c90b1fe4bee572ad11159a43826f23 (patch) | |
| tree | 6022cfbd477c43d2291ab4eb220659db8ae25b2c /arch/arm/mach-tegra/tegra_i2s_audio.c | |
| parent | 89c37cce1c850fe046df50ccb923a8eccbf259b6 (diff) | |
[ARM] tegra_i2s_audio: add a few overlooked checks
Signed-off-by: Iliyan Malchev <malchev@google.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 64ba1be2ab1f..48b1bec21f67 100644 --- a/arch/arm/mach-tegra/tegra_i2s_audio.c +++ b/arch/arm/mach-tegra/tegra_i2s_audio.c @@ -947,7 +947,7 @@ static int resume_dma_recording(struct audio_stream *ais) if (ais->dma_has_it) { pr_debug("%s: recording already in progress\n", __func__); - return 0; + return -EALREADY; } /* Don't send all the data yet. */ @@ -1035,7 +1035,7 @@ static int start_pio_playback(struct audio_stream *aos) if (i2s_is_fifo_enabled(ads->i2s_base, I2S_FIFO_TX)) { pr_debug("%s: playback is already in progress\n", __func__); - return 0; + return -EALREADY; } pr_debug("%s\n", __func__); @@ -1080,7 +1080,7 @@ static int start_pio_recording(struct audio_stream *ais) if (i2s_is_fifo_enabled(ads->i2s_base, I2S_FIFO_RX)) { pr_debug("%s: already started\n", __func__); - return 0; + return -EALREADY; } pr_debug("%s: start\n", __func__); @@ -1285,7 +1285,7 @@ again: } rc = start_playback(&ads->out); - if (rc < 0) { + if (rc < 0 && rc != -EALREADY) { pr_err("%s: could not start playback: %d\n", __func__, rc); goto done; } |