ALSA: cmipci: Use common error handling code in snd_cmipci_probe()
authorMarkus Elfring <elfring@users.sourceforge.net>
Tue, 22 Aug 2017 17:58:30 +0000 (19:58 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 22 Aug 2017 18:06:10 +0000 (20:06 +0200)
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>
sound/pci/cmipci.c

index a45245f16059c93bce739f2e4c8f50745745c97e..26a65787066420d983685f3c43f4bcc42a096eb5 100644 (file)
@@ -3295,20 +3295,23 @@ static int snd_cmipci_probe(struct pci_dev *pci,
                break;
        }
 
-       if ((err = snd_cmipci_create(card, pci, dev, &cm)) < 0) {
-               snd_card_free(card);
-               return err;
-       }
+       err = snd_cmipci_create(card, pci, dev, &cm);
+       if (err < 0)
+               goto free_card;
+
        card->private_data = cm;
 
-       if ((err = snd_card_register(card)) < 0) {
-               snd_card_free(card);
-               return err;
-       }
+       err = snd_card_register(card);
+       if (err < 0)
+               goto free_card;
+
        pci_set_drvdata(pci, card);
        dev++;
        return 0;
 
+free_card:
+       snd_card_free(card);
+       return err;
 }
 
 static void snd_cmipci_remove(struct pci_dev *pci)