]>
Commit | Line | Data |
---|---|---|
ba957a8b GKH |
1 | From stable-bounces@linux.kernel.org Fri Feb 1 15:20:59 2008 |
2 | From: Li Yang <leoli@freescale.com> | |
3 | Date: Fri, 1 Feb 2008 15:16:43 -0800 | |
4 | Subject: usb gadget: fix fsl_usb2_udc potential OOPS | |
5 | To: linux-usb@vger.kernel.org | |
6 | Cc: David Brownell <dbrownell@users.sourceforge.net>, Li Yang <leoli@freescale.com>, stable <stable@kernel.org>, Greg Kroah-Hartman <gregkh@suse.de> | |
7 | Message-ID: <1201907929-23721-2-git-send-email-gregkh@suse.de> | |
8 | ||
9 | ||
10 | From: Li Yang <leoli@freescale.com> | |
11 | ||
12 | For fsl_usb2_udc driver, ep0 also has a descriptor. Current code is | |
13 | misleading and contains a logical mistake. Here is the patch to fix it. | |
14 | ||
15 | http://bugzilla.kernel.org/show_bug.cgi?id=9595 | |
16 | ||
17 | Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> | |
18 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
19 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
20 | ||
21 | --- | |
22 | drivers/usb/gadget/fsl_usb2_udc.c | 2 +- | |
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
24 | ||
25 | --- a/drivers/usb/gadget/fsl_usb2_udc.c | |
26 | +++ b/drivers/usb/gadget/fsl_usb2_udc.c | |
27 | @@ -776,7 +776,7 @@ fsl_ep_queue(struct usb_ep *_ep, struct | |
28 | VDBG("%s, bad params\n", __FUNCTION__); | |
29 | return -EINVAL; | |
30 | } | |
31 | - if (!_ep || (!ep->desc && ep_index(ep))) { | |
32 | + if (unlikely(!_ep || !ep->desc)) { | |
33 | VDBG("%s, bad ep\n", __FUNCTION__); | |
34 | return -EINVAL; | |
35 | } |