diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2019-08-04 15:21:25 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-08-05 19:57:20 +0200 |
| commit | 7eb7b18e9fc7c8dc3d3c186ec6b0cfa9147299f8 (patch) | |
| tree | ff4e6c4a46004b8270721fbf9416033a2bf22444 | |
| parent | 94491c175d6bf4b838043a3fb5adabd731d8fbab (diff) | |
| download | linux-stable-7eb7b18e9fc7c8dc3d3c186ec6b0cfa9147299f8.tar.gz linux-stable-7eb7b18e9fc7c8dc3d3c186ec6b0cfa9147299f8.tar.bz2 linux-stable-7eb7b18e9fc7c8dc3d3c186ec6b0cfa9147299f8.zip | |
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) 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) |