|
@@ -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)
|