diff options
| author | Chris Zankel <chris@zankel.net> | 2015-08-29 23:55:58 (GMT) |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2015-08-29 23:55:58 (GMT) |
| commit | 650c919798c71fb34b77a6f2ba03a06907f06a76 (patch) | |
| tree | d1c60012d4d86846d25f1d0b783b5122c26a2e31 /drivers/usb/gadget/function/f_midi.c | |
| parent | 895fb3159280fe7695b35ec7c87ec19e13ca5b6e (diff) | |
| parent | 64291f7db5bd8150a74ad2036f1037e6a0428df2 (diff) | |
| download | linux-650c919798c71fb34b77a6f2ba03a06907f06a76.tar.xz | |
Merge tag 'v4.2' into for_next
Linux 4.2
Diffstat (limited to 'drivers/usb/gadget/function/f_midi.c')
| -rw-r--r-- | drivers/usb/gadget/function/f_midi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c index 6316aa5..ad50a67 100644 --- a/drivers/usb/gadget/function/f_midi.c +++ b/drivers/usb/gadget/function/f_midi.c @@ -1145,7 +1145,7 @@ static struct usb_function *f_midi_alloc(struct usb_function_instance *fi) if (opts->id && !midi->id) { status = -ENOMEM; mutex_unlock(&opts->lock); - goto kstrdup_fail; + goto setup_fail; } midi->in_ports = opts->in_ports; midi->out_ports = opts->out_ports; @@ -1164,8 +1164,6 @@ static struct usb_function *f_midi_alloc(struct usb_function_instance *fi) return &midi->func; -kstrdup_fail: - f_midi_unregister_card(midi); setup_fail: for (--i; i >= 0; i--) kfree(midi->in_port[i]); |