From: Markus Elfring <[email protected]> Date: Sat, 11 Nov 2017 18:26:06 +0100
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 <[email protected]> --- sound/mips/hal2.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/sound/mips/hal2.c b/sound/mips/hal2.c index 37d378a26a50..30563d9aa5c8 100644 --- a/sound/mips/hal2.c +++ b/sound/mips/hal2.c @@ -887,21 +887,16 @@ static int hal2_probe(struct platform_device *pdev) return err; err = hal2_create(card, &chip); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; err = hal2_pcm_create(chip); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; + err = hal2_mixer_create(chip); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; strcpy(card->driver, "SGI HAL2 Audio"); strcpy(card->shortname, "SGI HAL2 Audio"); @@ -910,12 +905,15 @@ static int hal2_probe(struct platform_device *pdev) SGI_HPCDMA_IRQ); err = snd_card_register(card); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; + platform_set_drvdata(pdev, card); return 0; + +free_card: + snd_card_free(card); + return err; } static int hal2_remove(struct platform_device *pdev) -- 2.15.0
