Skip to content

Commit a44f9d7

Browse files
Mark Kuopundiramit
authored andcommitted
CHROMIUM: usb: gadget: f_audio_source: add .free_func callback
When userspace unbinds gadget functions through configfs, the .free_func() callback is always invoked. (in config_usb_cfg_unlink()) Implement it as a no-op to avoid the following crash: [ 68.125679] configfs-gadget gadget: unbind function 'accessory'/ffffffc0720bf000 [ 68.133202] configfs-gadget gadget: unbind function 'audio_source'/ffffffc0012ca3c0 [ 68.142668] tegra-xudc 700d0000.usb-device: ep 0 disabled [ 68.148186] Bad mode in Synchronous Abort handler detected, code 0x86000006 [ 68.155144] CPU: 2 PID: 1 Comm: init Tainted: G U W 3.18.0-09419-g87296c3-dirty torvalds#561 [ 68.163743] Hardware name: Google Tegra210 Smaug Rev 1,3+ (DT) [ 68.169566] task: ffffffc0bc8d0000 ti: ffffffc0bc8bc000 task.ti: ffffffc0bc8bc000 [ 68.177039] PC is at 0x0 [ 68.179577] LR is at usb_put_function+0x14/0x1c .... BUG=chrome-os-partner:49140 TEST="setprop sys.usb.config accessory,audio_source" on A44 and then switch back to default: "setprop sys.usb.config mtp,adb", no crash will be seen. Change-Id: I5b6141964aab861e86e3afb139ded02d4d122dab Signed-off-by: Mark Kuo <mkuo@nvidia.com> Reviewed-on: https://chromium-review.googlesource.com/321013 Commit-Ready: Andrew Bresticker <abrestic@chromium.org> Tested-by: Andrew Bresticker <abrestic@chromium.org> Reviewed-by: Andrew Bresticker <abrestic@chromium.org>
1 parent 8b7f1d9 commit a44f9d7

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

drivers/usb/gadget/function/f_audio_source.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -586,6 +586,11 @@ static void audio_disable(struct usb_function *f)
586586
usb_ep_disable(audio->in_ep);
587587
}
588588

589+
static void audio_free_func(struct usb_function *f)
590+
{
591+
/* no-op */
592+
}
593+
589594
/*-------------------------------------------------------------------------*/
590595

591596
static void audio_build_desc(struct audio_dev *audio)
@@ -838,6 +843,7 @@ static struct audio_dev _audio_dev = {
838843
.set_alt = audio_set_alt,
839844
.setup = audio_setup,
840845
.disable = audio_disable,
846+
.free_func = audio_free_func,
841847
},
842848
.lock = __SPIN_LOCK_UNLOCKED(_audio_dev.lock),
843849
.idle_reqs = LIST_HEAD_INIT(_audio_dev.idle_reqs),

0 commit comments

Comments
 (0)