Skip to content

Commit

Permalink
ALSA: oxfw: break packet streaming at bus-reset handler
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Takashi Sakamoto authored and Takashi Iwai committed Jun 12, 2019
1 parent 20358d4 commit 7efa19a
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions sound/firewire/oxfw/oxfw-stream.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 7efa19a

Please sign in to comment.