summaryrefslogtreecommitdiffstats
path: root/sound/firewire/oxfw/oxfw-pcm.c
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2019-06-12 10:44:20 +0200
committerTakashi Iwai <tiwai@suse.de>2019-06-12 15:26:58 +0200
commit4a0a04729a44ea317270885e1722636b156cf620 (patch)
treee72d09df8d6087b5ea00309f6670d23aac24a9c1 /sound/firewire/oxfw/oxfw-pcm.c
parentALSA: oxfw: rename helper functions for duplex streams (diff)
downloadlinux-4a0a04729a44ea317270885e1722636b156cf620.tar.xz
linux-4a0a04729a44ea317270885e1722636b156cf620.zip
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-pcm.c')
-rw-r--r--sound/firewire/oxfw/oxfw-pcm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/firewire/oxfw/oxfw-pcm.c b/sound/firewire/oxfw/oxfw-pcm.c
index 253d79607bdf..79c8e514bed9 100644
--- a/sound/firewire/oxfw/oxfw-pcm.c
+++ b/sound/firewire/oxfw/oxfw-pcm.c
@@ -220,7 +220,7 @@ static int pcm_capture_hw_params(struct snd_pcm_substream *substream,
if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) {
mutex_lock(&oxfw->mutex);
- oxfw->capture_substreams++;
+ ++oxfw->substreams_count;
mutex_unlock(&oxfw->mutex);
}
@@ -239,7 +239,7 @@ static int pcm_playback_hw_params(struct snd_pcm_substream *substream,
if (substream->runtime->status->state == SNDRV_PCM_STATE_OPEN) {
mutex_lock(&oxfw->mutex);
- oxfw->playback_substreams++;
+ ++oxfw->substreams_count;
mutex_unlock(&oxfw->mutex);
}
@@ -253,7 +253,7 @@ static int pcm_capture_hw_free(struct snd_pcm_substream *substream)
mutex_lock(&oxfw->mutex);
if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN)
- oxfw->capture_substreams--;
+ --oxfw->substreams_count;
snd_oxfw_stream_stop_duplex(oxfw);
@@ -268,7 +268,7 @@ static int pcm_playback_hw_free(struct snd_pcm_substream *substream)
mutex_lock(&oxfw->mutex);
if (substream->runtime->status->state != SNDRV_PCM_STATE_OPEN)
- oxfw->playback_substreams--;
+ --oxfw->substreams_count;
snd_oxfw_stream_stop_duplex(oxfw);