ALSA: pcm: Use common error handling code in _snd_pcm_new()

Add a jump target so that a bit of exception handling can be better reused
at the end of this function.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index 89c7485..048df96 100644 (file)
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -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;
 }
 
 /**