From: Felipe Balbi Date: Mon, 2 Feb 2015 22:24:17 +0000 (-0600) Subject: usb: gadget: function: phonet: balance usb_ep_disable calls X-Git-Tag: v3.16.35~2499 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3de70a7f0e1f864cc2da0a036d277359af5447fb;p=thirdparty%2Fkernel%2Fstable.git 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 Signed-off-by: Felipe Balbi [ luis: backported to 3.16: - file rename: drivers/usb/gadget/function/f_phonet.c -> drivers/usb/gadget/f_phonet.c ] Signed-off-by: Luis Henriques --- diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/f_phonet.c index f2b781773eed3..c2f12c85c6f8d 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;