leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: oxfw: code refactoring for stop condition of packet streaming

Browse Source 
This commit unifies stop condition due to queueing error and unmatched
state of the target device.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto 2019-06-12 17:44:14 +09:00 committed by Takashi Iwai
parent 5ad840728a
commit da2af86d51
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/firewire/oxfw/oxfw-stream.c
View File

@ -288,10 +288,6 @@ int snd_oxfw_stream_start_simplex(struct snd_oxfw *oxfw,
if (err < 0) if (err < 0)
goto end; goto end;
/* packet queueing error */
if (amdtp_streaming_error(stream))
stop_stream(oxfw, stream);
err = snd_oxfw_stream_get_current_formation(oxfw, dir, &formation); err = snd_oxfw_stream_get_current_formation(oxfw, dir, &formation);
if (err < 0) if (err < 0)
goto end; goto end;
@ -300,7 +296,8 @@ int snd_oxfw_stream_start_simplex(struct snd_oxfw *oxfw,
if (pcm_channels == 0) if (pcm_channels == 0)
pcm_channels = formation.pcm; pcm_channels = formation.pcm;
if ((formation.rate != rate) || (formation.pcm != pcm_channels)) { if (formation.rate != rate || formation.pcm != pcm_channels ||
amdtp_streaming_error(stream)) {
if (opposite != NULL) { if (opposite != NULL) {
err = check_connection_used_by_others(oxfw, opposite); err = check_connection_used_by_others(oxfw, opposite);
if (err < 0) if (err < 0)