diff options
| author | Felipe Balbi <balbi@ti.com> | 2015-02-02 16:24:17 -0600 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-03-12 17:31:24 +0100 |
| commit | 2019319b6ab967b7c3de01472b3feca251976cf7 (patch) | |
| tree | b0a265a1656ef887a2c718a4f1b697e1047e71d9 | |
| parent | 476b1ec9fb4ab2f34b6bea7b6d6011d24f094597 (diff) | |
usb: gadget: function: phonet: balance usb_ep_disable calls
commit 9ec36f7fe20ef919cc15171e1da1b6739222541a upstream.
f_phonet's ->set_alt() method will call usb_ep_disable()
potentially on an endpoint which is already disabled. That's
something the gadget/function driver must guarantee that it's
always balanced.
In order to balance the calls, just make sure the endpoint
was enabled before by means of checking the validity of
driver_data.
Reported-by: Pali Rohár <pali.rohar@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | drivers/usb/gadget/f_phonet.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/f_phonet.c index eb3aa817a662..74ff54141416 100644 --- a/drivers/usb/gadget/f_phonet.c +++ b/drivers/usb/gadget/f_phonet.c @@ -417,7 +417,10 @@ static int pn_set_alt(struct usb_function *f, unsigned intf, unsigned alt) return -EINVAL; spin_lock(&port->lock); - __pn_reset(f); + + if (fp->in_ep->driver_data) + __pn_reset(f); + if (alt == 1) { int i; |