ALSA: fireface: fix return value in error path of isochronous resources reservation

takaswie · gregkh · commit 9e6a98bd416b · 2019-12-17T20:07:56.000+01:00
commit 4801363 upstream. Even if isochronous resources reservation fails, error code doesn't return in pcm.hw_params callback. Cc: <stable@vger.kernel.org> #5.3+ Fixes: 55162d2 ("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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/sound/firewire/fireface/ff-pcm.c b/sound/firewire/fireface/ff-pcm.c
@@ -219,7 +219,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)

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ static int pcm_hw_params(struct snd_pcm_substream *substream,`
`219`	`219`	`mutex_unlock(&ff->mutex);`
`220`	`220`	`}`
`221`	`221`
`222`		`- return 0;`
	`222`	`+ return err;`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`static int pcm_hw_free(struct snd_pcm_substream *substream)`