diff options
| author | Jiebing Li <jiebing.li@intel.com> | 2014-09-18 00:06:18 +0200 |
|---|---|---|
| committer | Mihai Serban <mihai.serban@intel.com> | 2016-01-08 14:46:26 +0200 |
| commit | 235f5579dae53afe495936ca1c2157fb055d54bd (patch) | |
| tree | 29e459c9b16de9ac6656e5529acc3888d7a0813c | |
| parent | d4e9b5d7666d60563818f8f63eb185f6632174a4 (diff) | |
| download | edison-v3.10-235f5579dae53afe495936ca1c2157fb055d54bd.tar.gz | |
VENDOR: intel: usb: gadget: ffs: avoid disable ep twice
When FFS gadget function is disabled, gadget driver tries to
disable the endpoints twice, which triggers warning message
in device driver.
This patch ensures that usb_ep_disable() is not called again
after the endpoint has been disabled.
Signed-off-by: Jiebing Li <jiebing.li@intel.com>
Signed-off-by: David Cohen <david.a.cohen@intel.com>
Bug: 26457812
Change-Id: I4e20bd0e918f0c26917f82f3cd0a513aa44d8499
Signed-off-by: Mihai Serban <mihai.serban@intel.com>
| -rw-r--r-- | drivers/usb/gadget/f_fs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c index c36f660dcc2..c69598f6071 100644 --- a/drivers/usb/gadget/f_fs.c +++ b/drivers/usb/gadget/f_fs.c @@ -1541,7 +1541,7 @@ static void ffs_func_eps_disable(struct ffs_function *func) spin_lock_irqsave(&func->ffs->eps_lock, flags); do { /* pending requests get nuked */ - if (likely(ep->ep)) + if (ep->ep && epfile->ep) usb_ep_disable(ep->ep); epfile->ep = NULL; |