From: Markus Elfring <[email protected]>
Date: Tue, 22 Aug 2017 14:00:21 +0200

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

Signed-off-by: Markus Elfring <[email protected]>
---
 sound/drivers/pcsp/pcsp.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/sound/drivers/pcsp/pcsp.c b/sound/drivers/pcsp/pcsp.c
index 72e2d0012084..c8ea4fed3905 100644
--- a/sound/drivers/pcsp/pcsp.c
+++ b/sound/drivers/pcsp/pcsp.c
@@ -108,22 +108,17 @@ static int snd_card_pcsp_probe(int devnum, struct device 
*dev)
                return err;
 
        err = snd_pcsp_create(card);
-       if (err < 0) {
-               snd_card_free(card);
-               return err;
-       }
+       if (err)
+               goto free_card;
+
        if (!nopcm) {
                err = snd_pcsp_new_pcm(&pcsp_chip);
-               if (err < 0) {
-                       snd_card_free(card);
-                       return err;
-               }
+               if (err)
+                       goto free_card;
        }
        err = snd_pcsp_new_mixer(&pcsp_chip, nopcm);
-       if (err < 0) {
-               snd_card_free(card);
-               return err;
-       }
+       if (err)
+               goto free_card;
 
        strcpy(card->driver, "PC-Speaker");
        strcpy(card->shortname, "pcsp");
@@ -131,7 +126,8 @@ static int snd_card_pcsp_probe(int devnum, struct device 
*dev)
                pcsp_chip.port);
 
        err = snd_card_register(card);
-       if (err < 0) {
+       if (err) {
+free_card:
                snd_card_free(card);
                return err;
        }
-- 
2.14.0

Reply via email to