diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-01-26 15:53:41 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-26 15:53:41 +0300 |
| commit | 7533185eeefd087d5472422181ae8edf75118213 (patch) | |
| tree | 6a62ccb019668215f70bcc9876a795548f57262a /drivers/usb/gadget/function/f_uac1.c | |
| parent | b4b33f9d64c3edcdcbea874acdc1e9626fd961f1 (diff) | |
| parent | 0767e95bb96d7fdddcd590fb809e6975d93aebc5 (diff) | |
| download | linux-7533185eeefd087d5472422181ae8edf75118213.tar.xz | |
Merge branch 'for-linus' into for-next
Sync with the latest 3.19-rc state for applying other ALSA sequencer
core fixes.
Diffstat (limited to 'drivers/usb/gadget/function/f_uac1.c')
| -rw-r--r-- | drivers/usb/gadget/function/f_uac1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c index f7b203293205..e9715845f82e 100644 --- a/drivers/usb/gadget/function/f_uac1.c +++ b/drivers/usb/gadget/function/f_uac1.c @@ -897,7 +897,6 @@ static void f_audio_free_inst(struct usb_function_instance *f) struct f_uac1_opts *opts; opts = container_of(f, struct f_uac1_opts, func_inst); - gaudio_cleanup(opts->card); if (opts->fn_play_alloc) kfree(opts->fn_play); if (opts->fn_cap_alloc) @@ -935,6 +934,7 @@ static void f_audio_free(struct usb_function *f) struct f_audio *audio = func_to_audio(f); struct f_uac1_opts *opts; + gaudio_cleanup(&audio->card); opts = container_of(f->fi, struct f_uac1_opts, func_inst); kfree(audio); mutex_lock(&opts->lock); |