From: Takashi Sakamoto Date: Wed, 12 Jun 2019 08:44:14 +0000 (+0900) Subject: ALSA: oxfw: code refactoring for stop condition of packet streaming X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=da2af86d51ac32067c77759e40a162d684690a43;p=linux.git ALSA: oxfw: code refactoring for stop condition of packet streaming This commit unifies stop condition due to queueing error and unmatched state of the target device. Signed-off-by: Takashi Sakamoto Signed-off-by: Takashi Iwai --- diff --git a/sound/firewire/oxfw/oxfw-stream.c b/sound/firewire/oxfw/oxfw-stream.c index f230a9e44c3c0..34ff673e6ff84 100644 --- a/sound/firewire/oxfw/oxfw-stream.c +++ b/sound/firewire/oxfw/oxfw-stream.c @@ -288,10 +288,6 @@ int snd_oxfw_stream_start_simplex(struct snd_oxfw *oxfw, if (err < 0) goto end; - /* packet queueing error */ - if (amdtp_streaming_error(stream)) - stop_stream(oxfw, stream); - err = snd_oxfw_stream_get_current_formation(oxfw, dir, &formation); if (err < 0) goto end; @@ -300,7 +296,8 @@ int snd_oxfw_stream_start_simplex(struct snd_oxfw *oxfw, if (pcm_channels == 0) 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) { err = check_connection_used_by_others(oxfw, opposite); if (err < 0)