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

takaswie · tiwai · commit 59a126aa3113 · 2019-12-09T20:05:12.000+01:00
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>
diff --git a/sound/firewire/oxfw/oxfw-pcm.c b/sound/firewire/oxfw/oxfw-pcm.c
@@ -285,7 +285,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
`@@ -285,7 +285,7 @@ static int pcm_playback_hw_params(struct snd_pcm_substream *substream,`
`285`	`285`	`mutex_unlock(&oxfw->mutex);`
`286`	`286`	`}`
`287`	`287`
`288`		`- return 0;`
	`288`	`+ return err;`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`static int pcm_capture_hw_free(struct snd_pcm_substream *substream)`