diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-01 15:28:33 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-12-01 15:28:33 +0000 |
commit | 162685e3506a88106dd36988060ad2c557617402 (patch) | |
tree | c77c63b1b6466addeeee70698c25a06dee0fbf66 /nuttx/drivers/usbdev | |
parent | fd4663810300c67fc2294fa9b0868516e39bf75d (diff) | |
download | px4-nuttx-162685e3506a88106dd36988060ad2c557617402.tar.gz px4-nuttx-162685e3506a88106dd36988060ad2c557617402.tar.bz2 px4-nuttx-162685e3506a88106dd36988060ad2c557617402.zip |
Should not returned queued read requests on a reset
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2294 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers/usbdev')
-rw-r--r-- | nuttx/drivers/usbdev/usbdev_scsi.c | 10 | ||||
-rw-r--r-- | nuttx/drivers/usbdev/usbdev_storage.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/nuttx/drivers/usbdev/usbdev_scsi.c b/nuttx/drivers/usbdev/usbdev_scsi.c index 700bb64fb..75c5b50d3 100644 --- a/nuttx/drivers/usbdev/usbdev_scsi.c +++ b/nuttx/drivers/usbdev/usbdev_scsi.c @@ -2544,12 +2544,12 @@ void *usbstrg_workerthread(void *arg) usbstrg_resetconfig(priv); } - /* These events require that a new configuration be established */ + /* These events require that a new configuration be established */ - if ((eventset & (USBSTRG_EVENT_CFGCHANGE|USBSTRG_EVENT_IFCHANGE)) != 0) - { - usbstrg_setconfig(priv, priv->thvalue); - } + if ((eventset & (USBSTRG_EVENT_CFGCHANGE|USBSTRG_EVENT_IFCHANGE)) != 0) + { + usbstrg_setconfig(priv, priv->thvalue); + } /* These events required that we send a deferred EP0 setup response */ diff --git a/nuttx/drivers/usbdev/usbdev_storage.c b/nuttx/drivers/usbdev/usbdev_storage.c index 43c02c66f..79b037478 100644 --- a/nuttx/drivers/usbdev/usbdev_storage.c +++ b/nuttx/drivers/usbdev/usbdev_storage.c @@ -1073,7 +1073,7 @@ static void usbstrg_lununinitialize(struct usbstrg_lun_s *lun) * * Description: * Set the device configuration by allocating and configuring endpoints and - * by allocating and queue read and write requests. + * by allocating and queuing read and write requests. * ****************************************************************************/ @@ -1101,7 +1101,7 @@ int usbstrg_setconfig(FAR struct usbstrg_dev_s *priv, ubyte config) /* Already configured -- Do nothing */ usbtrace(TRACE_CLSERROR(USBSTRG_TRACEERR_ALREADYCONFIGURED), 0); - return 0; + return OK; } /* Discard the previous configuration data */ @@ -1113,7 +1113,7 @@ int usbstrg_setconfig(FAR struct usbstrg_dev_s *priv, ubyte config) if (config == USBSTRG_CONFIGIDNONE) { usbtrace(TRACE_CLSERROR(USBSTRG_TRACEERR_CONFIGNONE), 0); - return 0; + return OK; } /* We only accept one configuration */ |