diff options
| author | Markus Elfring <elfring@users.sourceforge.net> | 2017-08-23 08:40:37 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-08-23 10:35:50 +0200 |
| commit | 97d15a141f84a02d40d2ee442df5c6bd2f62b3d8 (patch) | |
| tree | b9b1a11b2f720a7830acfb7182d2ccd750286f01 | |
| parent | e17a85eccfa0b7d0089af218b0c468d4b8a3c3c2 (diff) | |
| download | op-kernel-dev-97d15a141f84a02d40d2ee442df5c6bd2f62b3d8.zip op-kernel-dev-97d15a141f84a02d40d2ee442df5c6bd2f62b3d8.tar.gz | |
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>
| -rw-r--r-- | sound/core/pcm.c | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 89c7485..048df96 100644 --- 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; } /** |
