diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-14 09:41:06 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-14 09:41:06 +0100 |
| commit | 313e1a0a5f86cb129aa4542f61702a4bbb2079b9 (patch) | |
| tree | e2101b9bf805deca57b7b4ea21e3d789f5f050a0 /drivers/usb/gadget/function/f_loopback.c | |
| parent | d0167ad2954ee2d1c70704c454c646086b6653d6 (diff) | |
| parent | 2c247804796bbcaa90087f2196f68fdc20a5fe04 (diff) | |
Merge tag 'fixes-for-v4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes:
usb: fixes for v4.0-rc3
Revert interrupt endpoint support from g_zero as it regresses
musb.
A possible deadlock in isp1760 udc irq has been fixed.
A fix to dwc2 for disconnect IRQ handling.
We also have a new device ID for isp1760.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/function/f_loopback.c')
| -rw-r--r-- | drivers/usb/gadget/function/f_loopback.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/gadget/function/f_loopback.c b/drivers/usb/gadget/function/f_loopback.c index 298b46112b1a..39f49f1ad22f 100644 --- a/drivers/usb/gadget/function/f_loopback.c +++ b/drivers/usb/gadget/function/f_loopback.c @@ -289,8 +289,7 @@ static void disable_loopback(struct f_loopback *loop) struct usb_composite_dev *cdev; cdev = loop->function.config->cdev; - disable_endpoints(cdev, loop->in_ep, loop->out_ep, NULL, NULL, NULL, - NULL); + disable_endpoints(cdev, loop->in_ep, loop->out_ep, NULL, NULL); VDBG(cdev, "%s disabled\n", loop->function.name); } |