sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stm32: usbdev: Fix stale initialization invalidating later NULL check. From Juha Niskanen

Browse Source
This commit is contained in:
Gregory Nutt 2015-03-12 08:08:50 -06:00
parent 47b225848d
commit f8c73c3499
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/src/stm32/stm32_usbdev.c
View File

@ -1834,7 +1834,6 @@ static void stm32_ep0setup(struct stm32_usbdev_s *priv)
} }
else else
{ {
privep = &priv->eplist[epno];
response.w = 0; /* Not stalled */ response.w = 0; /* Not stalled */
nbytes = 2; /* Response size: 2 bytes */ nbytes = 2; /* Response size: 2 bytes */
@ -3157,7 +3156,7 @@ static int stm32_epstall(struct usbdev_ep_s *ep, bool resume)
{ {
struct stm32_ep_s *privep; struct stm32_ep_s *privep;
struct stm32_usbdev_s *priv; struct stm32_usbdev_s *priv;
uint8_t epno = USB_EPNO(ep->eplog); uint8_t epno;
uint16_t status; uint16_t status;
irqstate_t flags; irqstate_t flags;
@ -3168,6 +3167,7 @@ static int stm32_epstall(struct usbdev_ep_s *ep, bool resume)
return -EINVAL; return -EINVAL;
} }
#endif #endif
privep = (struct stm32_ep_s *)ep; privep = (struct stm32_ep_s *)ep;
priv = (struct stm32_usbdev_s *)privep->dev; priv = (struct stm32_usbdev_s *)privep->dev;
epno = USB_EPNO(ep->eplog); epno = USB_EPNO(ep->eplog);
@ -3347,7 +3347,6 @@ static struct usbdev_ep_s *stm32_allocep(struct usbdev_s *dev, uint8_t epno,
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPRESERVE), (uint16_t)epset); usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPRESERVE), (uint16_t)epset);
goto errout; goto errout;
} }
epno = USB_EPNO(privep->ep.eplog);
/* Allocate a PMA buffer for this endpoint */ /* Allocate a PMA buffer for this endpoint */
@ -3358,6 +3357,7 @@ static struct usbdev_ep_s *stm32_allocep(struct usbdev_s *dev, uint8_t epno,
usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPBUFFER), 0); usbtrace(TRACE_DEVERROR(STM32_TRACEERR_EPBUFFER), 0);
goto errout_with_ep; goto errout_with_ep;
} }
privep->bufno = (uint8_t)bufno; privep->bufno = (uint8_t)bufno;
return &privep->ep; return &privep->ep;