diff options
author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2019-08-04 02:21:25 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2019-08-05 13:57:20 -0400 |
commit | 7eb7b18e9fc7c8dc3d3c186ec6b0cfa9147299f8 (patch) | |
tree | ff4e6c4a46004b8270721fbf9416033a2bf22444 | |
parent | 94491c175d6bf4b838043a3fb5adabd731d8fbab (diff) |
ALSA: fireworks: code refactoring for bus reset handler
This commit is a preparation to support AMDTP domain.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/firewire/fireworks/fireworks_stream.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sound/firewire/fireworks/fireworks_stream.c b/sound/firewire/fireworks/fireworks_stream.c index 0f62c50055e9..af340491dc43 100644 --- a/sound/firewire/fireworks/fireworks_stream.c +++ b/sound/firewire/fireworks/fireworks_stream.c | |||
@@ -299,14 +299,11 @@ void snd_efw_stream_stop_duplex(struct snd_efw *efw) | |||
299 | 299 | ||
300 | void snd_efw_stream_update_duplex(struct snd_efw *efw) | 300 | void snd_efw_stream_update_duplex(struct snd_efw *efw) |
301 | { | 301 | { |
302 | if (cmp_connection_update(&efw->out_conn) < 0 || | 302 | stop_stream(efw, &efw->rx_stream); |
303 | cmp_connection_update(&efw->in_conn) < 0) { | 303 | stop_stream(efw, &efw->tx_stream); |
304 | stop_stream(efw, &efw->rx_stream); | 304 | |
305 | stop_stream(efw, &efw->tx_stream); | 305 | amdtp_stream_pcm_abort(&efw->rx_stream); |
306 | } else { | 306 | amdtp_stream_pcm_abort(&efw->tx_stream); |
307 | amdtp_stream_update(&efw->rx_stream); | ||
308 | amdtp_stream_update(&efw->tx_stream); | ||
309 | } | ||
310 | } | 307 | } |
311 | 308 | ||
312 | void snd_efw_stream_destroy_duplex(struct snd_efw *efw) | 309 | void snd_efw_stream_destroy_duplex(struct snd_efw *efw) |