|
@@ -783,21 +783,27 @@ static int _snd_pcm_new(struct snd_card *card, const char *id, int device,
|
|
|
INIT_LIST_HEAD(&pcm->list);
|
|
|
if (id)
|
|
|
strlcpy(pcm->id, id, sizeof(pcm->id));
|
|
|
- if ((err = snd_pcm_new_stream(pcm, SNDRV_PCM_STREAM_PLAYBACK, playback_count)) < 0) {
|
|
|
- snd_pcm_free(pcm);
|
|
|
- return err;
|
|
|
- }
|
|
|
- if ((err = snd_pcm_new_stream(pcm, SNDRV_PCM_STREAM_CAPTURE, capture_count)) < 0) {
|
|
|
- snd_pcm_free(pcm);
|
|
|
- return err;
|
|
|
- }
|
|
|
- if ((err = snd_device_new(card, SNDRV_DEV_PCM, pcm, &ops)) < 0) {
|
|
|
- snd_pcm_free(pcm);
|
|
|
- return err;
|
|
|
- }
|
|
|
+
|
|
|
+ err = snd_pcm_new_stream(pcm, SNDRV_PCM_STREAM_PLAYBACK,
|
|
|
+ playback_count);
|
|
|
+ if (err < 0)
|
|
|
+ goto free_pcm;
|
|
|
+
|
|
|
+ err = snd_pcm_new_stream(pcm, SNDRV_PCM_STREAM_CAPTURE, capture_count);
|
|
|
+ if (err < 0)
|
|
|
+ goto free_pcm;
|
|
|
+
|
|
|
+ err = snd_device_new(card, SNDRV_DEV_PCM, pcm, &ops);
|
|
|
+ if (err < 0)
|
|
|
+ goto free_pcm;
|
|
|
+
|
|
|
if (rpcm)
|
|
|
*rpcm = pcm;
|
|
|
return 0;
|
|
|
+
|
|
|
+free_pcm:
|
|
|
+ snd_pcm_free(pcm);
|
|
|
+ return err;
|
|
|
}
|
|
|
|
|
|
/**
|