diff options
| author | Xinyu Chen <b03824@freescale.com> | 2012-01-09 12:16:21 +0800 |
|---|---|---|
| committer | Xinyu Chen <b03824@freescale.com> | 2012-01-09 12:16:21 +0800 |
| commit | 951b812436e9aed71d44665e2243cf409b27adcd (patch) | |
| tree | c2af101cbc1d0113e1043e0516ea63a0de772220 /drivers/usb/gadget/f_audio.c | |
| parent | 083a297c124a17f6a98c3da885c4b2e5fd77d645 (diff) | |
| parent | e14ab2b954bc8725c220bd54d26f71b23c1836ad (diff) | |
Merge commit 'rel_imx_2.6.38_12.01.00_RC1' into imx_2.6.38_android
Conflicts:
drivers/input/touchscreen/egalax_ts.c
Diffstat (limited to 'drivers/usb/gadget/f_audio.c')
| -rw-r--r-- | drivers/usb/gadget/f_audio.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/gadget/f_audio.c b/drivers/usb/gadget/f_audio.c index 2d285ec6e8bc..3bc1fe2758e3 100644 --- a/drivers/usb/gadget/f_audio.c +++ b/drivers/usb/gadget/f_audio.c @@ -644,6 +644,10 @@ static int f_audio_set_alt(struct usb_function *f, unsigned intf, unsigned alt) static void f_audio_disable(struct usb_function *f) { + struct f_audio *audio = func_to_audio(f); + + usb_ep_disable(audio->out_ep); + return; } |