From 66e98353166bf120c4ca1b264b926b09b8d90d20 Mon Sep 17 00:00:00 2001 From: Nikhil Badola Date: Tue, 9 Jun 2015 16:47:17 +0530 Subject: 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 Change-Id: I449d00d49f2ae842aa256907021b95b7885ccaf5 Reviewed-on: http://git.am.freescale.net:8181/37641 Tested-by: Review Code-CDREVIEW Reviewed-by: Ramneek Mehresh Reviewed-by: Honghua Yin 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; -- cgit v0.10.2