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>

diff --git a/sound/firewire/fireworks/fireworks_stream.c b/sound/firewire/fireworks/fireworks_stream.c
index 0f62c50055e98227149e45a77eb09f58acbff7d1..af340491dc43f502cd6d1c05d5459a40d41a613b 100644 (file)
--- 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)
 
 void snd_efw_stream_update_duplex(struct snd_efw *efw)
 {
-       if (cmp_connection_update(&efw->out_conn) < 0 ||
-           cmp_connection_update(&efw->in_conn) < 0) {
-               stop_stream(efw, &efw->rx_stream);
-               stop_stream(efw, &efw->tx_stream);
-       } else {
-               amdtp_stream_update(&efw->rx_stream);
-               amdtp_stream_update(&efw->tx_stream);
-       }
+       stop_stream(efw, &efw->rx_stream);
+       stop_stream(efw, &efw->tx_stream);
+
+       amdtp_stream_pcm_abort(&efw->rx_stream);
+       amdtp_stream_pcm_abort(&efw->tx_stream);
 }
 
 void snd_efw_stream_destroy_duplex(struct snd_efw *efw)