summaryrefslogtreecommitdiff
path: root/nuttx/drivers/usbhost/usbhost_storage.c
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-05-12 12:58:56 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-05-12 12:58:56 +0000
commit89b1a8ab25add376d10563320dc01c4843118596 (patch)
tree6635001e24e49d9944fe3db24265843737b450b9 /nuttx/drivers/usbhost/usbhost_storage.c
parent7596c8e003e4bbe8722cce117d283d6209257445 (diff)
downloadpx4-nuttx-89b1a8ab25add376d10563320dc01c4843118596.tar.gz
px4-nuttx-89b1a8ab25add376d10563320dc01c4843118596.tar.bz2
px4-nuttx-89b1a8ab25add376d10563320dc01c4843118596.zip
Fix USB host error handling logic
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3593 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers/usbhost/usbhost_storage.c')
-rw-r--r--nuttx/drivers/usbhost/usbhost_storage.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/nuttx/drivers/usbhost/usbhost_storage.c b/nuttx/drivers/usbhost/usbhost_storage.c
index 118758a60..7a41cde65 100644
--- a/nuttx/drivers/usbhost/usbhost_storage.c
+++ b/nuttx/drivers/usbhost/usbhost_storage.c
@@ -937,6 +937,10 @@ static void usbhost_destroy(FAR void *arg)
* On success, zero (OK) is returned. On a failure, a negated errno value is
* returned indicating the nature of the failure
*
+ * NOTE that the class instance remains valid upon return with a failure. It is
+ * the responsibility of the higher level enumeration logic to call
+ * CLASS_DISCONNECTED to free up the class driver resources.
+ *
* Assumptions:
* This function will *not* be called from an interrupt handler.
*
@@ -1308,14 +1312,6 @@ static inline int usbhost_initvolume(FAR struct usbhost_state_s *priv)
}
}
- /* Disconnect on any errors detected during volume initialization */
-
- if (ret != OK)
- {
- udbg("ERROR! Aborting: %d\n", ret);
- usbhost_destroy(priv);
- }
-
return ret;
}