ALSA: 6fire: Use common error handling code in usb6fire_chip_probe()

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/usb/6fire/chip.c b/sound/usb/6fire/chip.c
index bc2a24f7a79189d60909e26170602eb718d06708..c7641cb506164cf268a9a2e2657f777875af2d3c 100644 (file)
--- a/sound/usb/6fire/chip.c
+++ b/sound/usb/6fire/chip.c
@@ -143,37 +143,32 @@ static int usb6fire_chip_probe(struct usb_interface *intf,
        chip->card = card;
 
        ret = usb6fire_comm_init(chip);
-       if (ret < 0) {
-               usb6fire_chip_destroy(chip);
-               return ret;
-       }
+       if (ret < 0)
+               goto destroy_chip;
 
        ret = usb6fire_midi_init(chip);
-       if (ret < 0) {
-               usb6fire_chip_destroy(chip);
-               return ret;
-       }
+       if (ret < 0)
+               goto destroy_chip;
 
        ret = usb6fire_pcm_init(chip);
-       if (ret < 0) {
-               usb6fire_chip_destroy(chip);
-               return ret;
-       }
+       if (ret < 0)
+               goto destroy_chip;
 
        ret = usb6fire_control_init(chip);
-       if (ret < 0) {
-               usb6fire_chip_destroy(chip);
-               return ret;
-       }
+       if (ret < 0)
+               goto destroy_chip;
 
        ret = snd_card_register(card);
        if (ret < 0) {
                dev_err(&intf->dev, "cannot register card.");
-               usb6fire_chip_destroy(chip);
-               return ret;
+               goto destroy_chip;
        }
        usb_set_intfdata(intf, chip);
        return 0;
+
+destroy_chip:
+       usb6fire_chip_destroy(chip);
+       return ret;
 }
 
 static void usb6fire_chip_disconnect(struct usb_interface *intf)