summaryrefslogtreecommitdiff
path: root/sound/firewire/oxfw/oxfw-stream.c
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2019-06-12 17:44:20 +0900
committerTakashi Iwai <tiwai@suse.de>2019-06-12 15:26:58 +0200
commit4a0a04729a44ea317270885e1722636b156cf620 (patch)
treee72d09df8d6087b5ea00309f6670d23aac24a9c1 /sound/firewire/oxfw/oxfw-stream.c
parent779f0dba0b99f32276315ba40e812648b6ceed34 (diff)
ALSA: oxfw: unify substreams counter
In former commits, two isochronous contexts are handles at the same time. This commit unifies stream counters to obsolete them. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/oxfw/oxfw-stream.c')
-rw-r--r--sound/firewire/oxfw/oxfw-stream.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/firewire/oxfw/oxfw-stream.c b/sound/firewire/oxfw/oxfw-stream.c
index 52cf815c27f7..ebfe0777773b 100644
--- a/sound/firewire/oxfw/oxfw-stream.c
+++ b/sound/firewire/oxfw/oxfw-stream.c
@@ -244,7 +244,7 @@ int snd_oxfw_stream_start_duplex(struct snd_oxfw *oxfw,
enum avc_general_plug_dir dir;
int err = 0;
- if (oxfw->capture_substreams == 0 && oxfw->playback_substreams == 0)
+ if (oxfw->substreams_count == 0)
return -EIO;
// Considering JACK/FFADO streaming:
@@ -323,7 +323,7 @@ error:
void snd_oxfw_stream_stop_duplex(struct snd_oxfw *oxfw)
{
- if (oxfw->capture_substreams == 0 && oxfw->playback_substreams == 0) {
+ if (oxfw->substreams_count == 0) {
amdtp_stream_stop(&oxfw->rx_stream);
cmp_connection_break(&oxfw->in_conn);