iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: audio gadget: free alsa devices when unloading

Browse Source 
Signed-off-by: Cliff Cai <cliff.cai@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Cliff Cai 2009-12-09 22:28:39 -05:00 committed by Greg Kroah-Hartman
parent d16f172622
commit feef1d952e
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/usb/gadget/audio.c
View File

@ -158,6 +158,7 @@ fail:
static int __exit audio_unbind(struct usb_composite_dev *cdev) static int __exit audio_unbind(struct usb_composite_dev *cdev)
{ {
gaudio_cleanup();
return 0; return 0;
} }

2
drivers/usb/gadget/f_audio.c
View File

@ -792,7 +792,7 @@ int __init audio_bind_config(struct usb_configuration *c)
return status; return status;
add_fail: add_fail:
gaudio_cleanup(&audio->card); gaudio_cleanup();
setup_fail: setup_fail:
kfree(audio); kfree(audio);
return status; return status;

12
drivers/usb/gadget/u_audio.c
View File

@ -288,6 +288,7 @@ static int gaudio_close_snd_dev(struct gaudio *gau)
return 0; return 0;
} }
static struct gaudio *the_card;
/** /**
* gaudio_setup - setup ALSA interface and preparing for USB transfer * gaudio_setup - setup ALSA interface and preparing for USB transfer
* *
@ -303,6 +304,9 @@ int __init gaudio_setup(struct gaudio *card)
if (ret) if (ret)
ERROR(card, "we need at least one control device\n"); ERROR(card, "we need at least one control device\n");
if (!the_card)
the_card = card;
return ret; return ret;
} }
@ -312,9 +316,11 @@ int __init gaudio_setup(struct gaudio *card)
* *
* This is called to free all resources allocated by @gaudio_setup(). * This is called to free all resources allocated by @gaudio_setup().
*/ */
void gaudio_cleanup(struct gaudio *card) void gaudio_cleanup(void)
{ {
if (card) if (the_card) {
gaudio_close_snd_dev(card); gaudio_close_snd_dev(the_card);
the_card = NULL;
}
} }

2
drivers/usb/gadget/u_audio.h
View File

@ -51,6 +51,6 @@ struct gaudio {
}; };
int gaudio_setup(struct gaudio *card); int gaudio_setup(struct gaudio *card);
void gaudio_cleanup(struct gaudio *card); void gaudio_cleanup(void);
#endif /* __U_AUDIO_H */ #endif /* __U_AUDIO_H */