ALSA: oxfw: break packet streaming at bus-reset handler

In most cases, recovery from bus reset is not successful. This commit
aborts packet streaming in bus reset handler.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/firewire/oxfw/oxfw-stream.c b/sound/firewire/oxfw/oxfw-stream.c
index bb4ba6c196ea7ef2fe1381b9f9ea4705ba483edd..806a7fded99d414c3565d86849d1968168ab359a 100644 (file)
--- a/sound/firewire/oxfw/oxfw-stream.c
+++ b/sound/firewire/oxfw/oxfw-stream.c
@@ -363,17 +363,10 @@ void snd_oxfw_stream_destroy_simplex(struct snd_oxfw *oxfw,
 void snd_oxfw_stream_update_simplex(struct snd_oxfw *oxfw,
                                    struct amdtp_stream *stream)
 {
-       struct cmp_connection *conn;
-
-       if (stream == &oxfw->tx_stream)
-               conn = &oxfw->out_conn;
-       else
-               conn = &oxfw->in_conn;
+       stop_stream(oxfw, &oxfw->rx_stream);
 
-       if (cmp_connection_update(conn) < 0)
-               stop_stream(oxfw, stream);
-       else
-               amdtp_stream_update(stream);
+       if (oxfw->has_output)
+               stop_stream(oxfw, &oxfw->tx_stream);
 }
 
 int snd_oxfw_stream_get_current_formation(struct snd_oxfw *oxfw,