summaryrefslogtreecommitdiff
path: root/nuttx
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-01-04 23:06:20 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-01-04 23:06:20 +0000
commit76faecb6a81930102a78a1c1157b47bc4c177ed5 (patch)
treeea0befdf330e147a34c087226c4abe13dc4880ce /nuttx
parentf91fd53c6b97f4bb94aa8422728a926bda6a28d1 (diff)
downloadpx4-nuttx-76faecb6a81930102a78a1c1157b47bc4c177ed5.tar.gz
px4-nuttx-76faecb6a81930102a78a1c1157b47bc4c177ed5.tar.bz2
px4-nuttx-76faecb6a81930102a78a1c1157b47bc4c177ed5.zip
Fix an error in the PIC32 USB device driver
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4261 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
-rw-r--r--nuttx/arch/mips/src/pic32mx/pic32mx-usbdev.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-usbdev.c b/nuttx/arch/mips/src/pic32mx/pic32mx-usbdev.c
index 7b9ac0eef..2eb292bc4 100644
--- a/nuttx/arch/mips/src/pic32mx/pic32mx-usbdev.c
+++ b/nuttx/arch/mips/src/pic32mx/pic32mx-usbdev.c
@@ -3639,7 +3639,7 @@ void up_usbinitialize(void)
pic32mx_hwsetup(priv);
- /* Attach USB controller interrupt handlers. The hardware will not be
+ /* Attach USB controller interrupt handler. The hardware will not be
* initialized and interrupts will not be enabled until the class device
* driver is bound. Getting the IRQs here only makes sure that we have
* them when we need them later.
@@ -3649,11 +3649,8 @@ void up_usbinitialize(void)
{
usbtrace(TRACE_DEVERROR(PIC32MX_TRACEERR_IRQREGISTRATION),
(uint16_t)PIC32MX_IRQ_USB);
- goto errout;
+ up_usbuninitialize();
}
-
-errout:
- up_usbuninitialize();
}
/****************************************************************************