redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Markus Elfring 2017-09-06 16:26:29 +02:00 committed by Takashi Iwai
parent d2d9770879
commit f804fff136
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sound/usb/6fire/chip.c
View File

@ -143,37 +143,32 @@ static int usb6fire_chip_probe(struct usb_interface *intf,
chip->card = card; chip->card = card;
ret = usb6fire_comm_init(chip); ret = usb6fire_comm_init(chip);
if (ret < 0) { if (ret < 0)
usb6fire_chip_destroy(chip); goto destroy_chip;
return ret;
}
ret = usb6fire_midi_init(chip); ret = usb6fire_midi_init(chip);
if (ret < 0) { if (ret < 0)
usb6fire_chip_destroy(chip); goto destroy_chip;
return ret;
}
ret = usb6fire_pcm_init(chip); ret = usb6fire_pcm_init(chip);
if (ret < 0) { if (ret < 0)
usb6fire_chip_destroy(chip); goto destroy_chip;
return ret;
}
ret = usb6fire_control_init(chip); ret = usb6fire_control_init(chip);
if (ret < 0) { if (ret < 0)
usb6fire_chip_destroy(chip); goto destroy_chip;
return ret;
}
ret = snd_card_register(card); ret = snd_card_register(card);
if (ret < 0) { if (ret < 0) {
dev_err(&intf->dev, "cannot register card."); dev_err(&intf->dev, "cannot register card.");
usb6fire_chip_destroy(chip); goto destroy_chip;
return ret;
} }
usb_set_intfdata(intf, chip); usb_set_intfdata(intf, chip);
return 0; return 0;
destroy_chip:
usb6fire_chip_destroy(chip);
return ret;
} }
static void usb6fire_chip_disconnect(struct usb_interface *intf) static void usb6fire_chip_disconnect(struct usb_interface *intf)