diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-03-16 20:59:21 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-03-16 20:59:21 +0000 |
commit | 7bfcfe92cfcefc051348012db2ee0a79956a1a82 (patch) | |
tree | 13ef18c9305fc93f54bea5baabd4547c42ea8ba6 /nuttx/drivers | |
parent | b41ddbd4ae44708b90316e31ae95c01cb540b09d (diff) | |
download | px4-nuttx-7bfcfe92cfcefc051348012db2ee0a79956a1a82.tar.gz px4-nuttx-7bfcfe92cfcefc051348012db2ee0a79956a1a82.tar.bz2 px4-nuttx-7bfcfe92cfcefc051348012db2ee0a79956a1a82.zip |
Updates to the PIC32 USB driver (still kind of buggy); Fix for STM32 CAN2 -- Need to enable CAN1 clocking to use CAN2
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4493 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers')
-rw-r--r-- | nuttx/drivers/usbdev/usbmsc_scsi.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nuttx/drivers/usbdev/usbmsc_scsi.c b/nuttx/drivers/usbdev/usbmsc_scsi.c index 799f81ea6..a2f661906 100644 --- a/nuttx/drivers/usbdev/usbmsc_scsi.c +++ b/nuttx/drivers/usbdev/usbmsc_scsi.c @@ -1683,6 +1683,7 @@ static int usbmsc_cmdparsestate(FAR struct usbmsc_dev_s *priv) usbtrace(TRACE_CLSERROR(USBMSC_TRACEERR_CMDPARSEWRREQLISTEMPTY), 0); return -ENOMEM; } + DEBUGASSERT(privreq->req && privreq->req->buf); buf = privreq->req->buf; @@ -2332,9 +2333,9 @@ static int usbmsc_cmdfinishstate(FAR struct usbmsc_dev_s *priv) usleep (100000); (void)EP_STALL(priv->epbulkin); - /* now wait for stall to go away .... */ + /* now wait for stall to go away .... */ - usleep (100000); + usleep (100000); #else (void)EP_STALL(priv->epbulkin); #endif |