summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikhil Badola <nikhil.badola@freescale.com>2015-06-09 11:17:17 (GMT)
committerHonghua Yin <Hong-Hua.Yin@freescale.com>2015-06-10 03:17:38 (GMT)
commit66e98353166bf120c4ca1b264b926b09b8d90d20 (patch)
tree8741cd9e1ca488efe44b80fdb2787844ebab2eda
parent21090f1e2889190450ec0b833dffd0a3af372e2a (diff)
downloadlinux-fsl-qoriq-66e98353166bf120c4ca1b264b926b09b8d90d20.tar.xz
drivers: usb: gadget: Correct NULL pointer checking in fsl gadget
Correct NULL pointer checking for endpoint descriptor before it gets dereferenced Signed-off-by: Nikhil Badola <nikhil.badola@freescale.com> Change-Id: I449d00d49f2ae842aa256907021b95b7885ccaf5 Reviewed-on: http://git.am.freescale.net:8181/37641 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Ramneek Mehresh <ramneek.mehresh@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
-rw-r--r--drivers/usb/gadget/fsl_udc_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c
index 638a345..2068625 100644
--- a/drivers/usb/gadget/fsl_udc_core.c
+++ b/drivers/usb/gadget/fsl_udc_core.c
@@ -1059,7 +1059,7 @@ static int fsl_ep_fifo_status(struct usb_ep *_ep)
struct ep_queue_head *qh;
ep = container_of(_ep, struct fsl_ep, ep);
- if (!_ep || (!ep->ep.desc && ep_index(ep) != 0))
+ if (!_ep || !ep->ep.desc || (ep_index(ep) == 0))
return -ENODEV;
udc = (struct fsl_udc *)ep->udc;