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

takaswie · gregkh · commit dc4f813f1d66 · 2019-12-17T19:56:27.000+01:00
commit 59a126a 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: 4f380d0 ("ALSA: oxfw: configure packet format in pcm.hw_params callback") 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/oxfw/oxfw-pcm.c b/sound/firewire/oxfw/oxfw-pcm.c
@@ -255,7 +255,7 @@ static int pcm_playback_hw_params(struct snd_pcm_substream *substream,
 		mutex_unlock(&oxfw->mutex);
 	}
 
-	return 0;
+	return err;
 }
 
 static int pcm_capture_hw_free(struct snd_pcm_substream *substream)

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ static int pcm_playback_hw_params(struct snd_pcm_substream *substream,`
`255`	`255`	`mutex_unlock(&oxfw->mutex);`
`256`	`256`	`}`
`257`	`257`
`258`		`- return 0;`
	`258`	`+ return err;`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`static int pcm_capture_hw_free(struct snd_pcm_substream *substream)`