summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2019-12-09 16:05:41 +0100
committerTakashi Iwai <tiwai@suse.de>2019-12-09 20:06:18 +0100
commit480136343cbe89426d6c2ab74ffb4e3ee572c7ee (patch)
treeef0ac59328f6b0f4c6ce6721414cb53502315107
parentALSA: oxfw: fix return value in error path of isochronous resources reservation (diff)
downloadlinux-480136343cbe89426d6c2ab74ffb4e3ee572c7ee.tar.xz
linux-480136343cbe89426d6c2ab74ffb4e3ee572c7ee.zip
ALSA: fireface: fix return value in error path of isochronous resources reservation
Even if isochronous resources reservation fails, error code doesn't return in pcm.hw_params callback. Cc: <stable@vger.kernel.org> #5.3+ Fixes: 55162d2bb0e8 ("ALSA: fireface: reserve/release isochronous resources in pcm.hw_params/hw_free callbacks") Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Link: https://lore.kernel.org/r/20191209151655.GA8090@workstation Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/firewire/fireface/ff-pcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/firewire/fireface/ff-pcm.c b/sound/firewire/fireface/ff-pcm.c
index 4e3bd9a2bec0..bd91c6ecb112 100644
--- a/sound/firewire/fireface/ff-pcm.c
+++ b/sound/firewire/fireface/ff-pcm.c
@@ -247,7 +247,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream,
mutex_unlock(&ff->mutex);
}
- return 0;
+ return err;
}
static int pcm_hw_free(struct snd_pcm_substream *substream)