diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-03-20 14:25:56 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-03-20 14:25:56 -0600 |
| commit | 641ed1fd58895554a604c5314fff44330c9e9bf0 (patch) | |
| tree | 53c8fe235b020562e538d2972d09e2dce4976609 /nuttx/drivers/usbdev | |
| parent | e37095fc6e0b14e407f24c58b526445d7edcdece (diff) | |
| download | px4-nuttx-641ed1fd58895554a604c5314fff44330c9e9bf0.tar.gz px4-nuttx-641ed1fd58895554a604c5314fff44330c9e9bf0.tar.bz2 px4-nuttx-641ed1fd58895554a604c5314fff44330c9e9bf0.zip | |
SAM4E UDP: Several fixes related to bulk endpoint transfers
Diffstat (limited to 'nuttx/drivers/usbdev')
| -rw-r--r-- | nuttx/drivers/usbdev/usbmsc_scsi.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nuttx/drivers/usbdev/usbmsc_scsi.c b/nuttx/drivers/usbdev/usbmsc_scsi.c index 06f1d8bb8..9347638ef 100644 --- a/nuttx/drivers/usbdev/usbmsc_scsi.c +++ b/nuttx/drivers/usbdev/usbmsc_scsi.c @@ -593,7 +593,7 @@ static inline int usbmsc_cmdinquiry(FAR struct usbmsc_dev_s *priv, else { memset(response, 0, SCSIRESP_INQUIRY_SIZEOF); - priv->nreqbytes = SCSIRESP_INQUIRY_SIZEOF; + priv->nreqbytes = SCSIRESP_INQUIRY_SIZEOF; #ifdef CONFIG_USBMSC_REMOVABLE response->flags1 = SCSIRESP_INQUIRYFLAGS1_RMB; @@ -1963,9 +1963,10 @@ static int usbmsc_cmdparsestate(FAR struct usbmsc_dev_s *priv) */ usbtrace(TRACE_CLASSSTATE(USBMSC_CLASSSTATE_CMDPARSECMDFINISH), priv->cdb[0]); - priv->thstate = USBMSC_STATE_CMDFINISH; + priv->thstate = USBMSC_STATE_CMDFINISH; ret = OK; } + return ret; } @@ -2053,6 +2054,7 @@ static int usbmsc_cmdreadstate(FAR struct usbmsc_dev_s *priv) priv->nreqbytes = 0; return -ENOMEM; } + req = privreq->req; /* Transfer all of the data that will (1) fit into the request buffer, OR (2) @@ -2305,7 +2307,7 @@ static int usbmsc_cmdfinishstate(FAR struct usbmsc_dev_s *priv) if (priv->cbwlen > 0) { /* On most commands (the exception is outgoing, write commands), - * the data has not not yet been sent. + * the data has not yet been sent. */ if (priv->nreqbytes > 0) |