diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-05-19 18:49:45 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-05-25 23:34:47 +0200 |
| commit | 3e02c5a60e182708005973e34a439d1e25ace9b5 (patch) | |
| tree | e372143ca563a4d2841617040af6802989d40cdb | |
| parent | 00277e2b5ffcf9ffb3afb5f728f7f01ad165cbff (diff) | |
| download | linux-stable-3e02c5a60e182708005973e34a439d1e25ace9b5.tar.gz linux-stable-3e02c5a60e182708005973e34a439d1e25ace9b5.tar.bz2 linux-stable-3e02c5a60e182708005973e34a439d1e25ace9b5.zip | |
ALSA: rme32: Deliver indirect-PCM transfer error
Now that the indirect-PCM transfer helper gives back an error, we
should return the error from ack callbacks.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/pci/rme32.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c index 96d15db65dfd..f9b424056d0f 100644 --- a/sound/pci/rme32.c +++ b/sound/pci/rme32.c @@ -1157,9 +1157,8 @@ static int snd_rme32_playback_fd_ack(struct snd_pcm_substream *substream) if (rme32->running & (1 << SNDRV_PCM_STREAM_CAPTURE)) rec->hw_queue_size -= cprec->hw_ready; spin_unlock(&rme32->lock); - snd_pcm_indirect_playback_transfer(substream, rec, - snd_rme32_pb_trans_copy); - return 0; + return snd_pcm_indirect_playback_transfer(substream, rec, + snd_rme32_pb_trans_copy); } static void snd_rme32_cp_trans_copy(struct snd_pcm_substream *substream, @@ -1174,9 +1173,8 @@ static void snd_rme32_cp_trans_copy(struct snd_pcm_substream *substream, static int snd_rme32_capture_fd_ack(struct snd_pcm_substream *substream) { struct rme32 *rme32 = snd_pcm_substream_chip(substream); - snd_pcm_indirect_capture_transfer(substream, &rme32->capture_pcm, - snd_rme32_cp_trans_copy); - return 0; + return snd_pcm_indirect_capture_transfer(substream, &rme32->capture_pcm, + snd_rme32_cp_trans_copy); } static snd_pcm_uframes_t |