OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

AMA5 OHCI: Pointers to allocated port values were not being nullified after being deallocated. This caused some assertions when debug was enabled

This commit is contained in:
Gregory Nutt 2014-07-04 08:17:14 -06:00
parent 8c8a2c497a
commit 858587d633
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/src/sama5/sam_ohci.c
View File

@ -1394,12 +1394,12 @@ static int sam_ep0enqueue(struct sam_rhport_s *rhport)
tdtail = sam_tdalloc();
if (!tdtail)
{
sam_edfree(rhport->ep0.ed);
sam_edfree(edctrl);
irqrestore(flags);
return -ENOMEM;
}
rhport->ep0.ed = edctrl;
rhport->ep0.ed = edctrl;
rhport->ep0.tail = tdtail;
/* ControlListEnable. This bit is cleared to disable the processing of the
@ -1466,7 +1466,7 @@ static int sam_ep0enqueue(struct sam_rhport_s *rhport)
* Name: sam_ep0dequeue
*
* Description:
* Remove the ED for EP0 from the control ED list and posssibly disable control
* Remove the ED for EP0 from the control ED list and possibly disable control
* list processing.
*
* Input Parameters:
@ -1548,6 +1548,7 @@ static void sam_ep0dequeue(struct sam_rhport_s *rhport)
sam_putreg(regval, SAM_USBHOST_CTRL);
}
}
irqrestore(flags);
/* Release any TDs that may still be attached to the ED. */
@ -1567,6 +1568,9 @@ static void sam_ep0dequeue(struct sam_rhport_s *rhport)
sam_tdfree(tdtail);
sam_edfree(edctrl);
rhport->ep0.ed = NULL;
rhport->ep0.tail = NULL;
}
/*******************************************************************************