diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2019-12-09 08:22:26 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-12-09 07:55:45 +0100 |
| commit | 9ff3483e5c552311676369b31bc64f0e8208fcd2 (patch) | |
| tree | 6f15d083a6a0a9cbbab123edacbf3ae1af2d1101 /sound | |
| parent | c08f0a92f4bef9467810551a2db0201d1b95d01e (diff) | |
| download | linux-9ff3483e5c552311676369b31bc64f0e8208fcd2.tar.gz linux-9ff3483e5c552311676369b31bc64f0e8208fcd2.tar.bz2 linux-9ff3483e5c552311676369b31bc64f0e8208fcd2.zip | |
ALSA: firewire-motu: fix double unlocked 'motu->mutex'
Mutex is doubly unlocked in some error path of pcm.open. This commit fixes
ALSA firewire-motu driver in Linux kernel v5.5.
Reported-by: kbuild test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: 3fd80b200388 ("ALSA: firewire-motu: use the same size of period for PCM substream in AMDTP streams")
Fixes: 0f5482e7875b ("ALSA: firewire-motu: share PCM buffer size for both direction")
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20191208232226.6685-1-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/firewire/motu/motu-pcm.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/firewire/motu/motu-pcm.c b/sound/firewire/motu/motu-pcm.c index 349b4d09e84f..005970931030 100644 --- a/sound/firewire/motu/motu-pcm.c +++ b/sound/firewire/motu/motu-pcm.c @@ -177,18 +177,14 @@ static int pcm_open(struct snd_pcm_substream *substream) err = snd_pcm_hw_constraint_minmax(substream->runtime, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, frames_per_period, frames_per_period); - if (err < 0) { - mutex_unlock(&motu->mutex); + if (err < 0) goto err_locked; - } err = snd_pcm_hw_constraint_minmax(substream->runtime, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, frames_per_buffer, frames_per_buffer); - if (err < 0) { - mutex_unlock(&motu->mutex); + if (err < 0) goto err_locked; - } } } |