summaryrefslogtreecommitdiff
path: root/nuttx/drivers/usbhost/usbhost_storage.c
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-08-13 14:12:27 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-08-13 14:12:27 -0600
commit61c04ffffaf6cf9024d740c04443e66c6fff500e (patch)
tree01551d7fde98839794c304ad107cc60f3a813d31 /nuttx/drivers/usbhost/usbhost_storage.c
parent40b7091f0f82c08d8da62c5ea913dbca122ca1f1 (diff)
downloadnuttx-61c04ffffaf6cf9024d740c04443e66c6fff500e.tar.gz
nuttx-61c04ffffaf6cf9024d740c04443e66c6fff500e.tar.bz2
nuttx-61c04ffffaf6cf9024d740c04443e66c6fff500e.zip
Back out most of the changes of 3b04d08043742b9e65cf38d45988b35bff91daed
Diffstat (limited to 'nuttx/drivers/usbhost/usbhost_storage.c')
-rw-r--r--nuttx/drivers/usbhost/usbhost_storage.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/nuttx/drivers/usbhost/usbhost_storage.c b/nuttx/drivers/usbhost/usbhost_storage.c
index bc0f78c75..89ec6238f 100644
--- a/nuttx/drivers/usbhost/usbhost_storage.c
+++ b/nuttx/drivers/usbhost/usbhost_storage.c
@@ -128,7 +128,6 @@ struct usbhost_state_s
char sdchar; /* Character identifying the /dev/sd[n] device */
volatile bool disconnected; /* TRUE: Device has been disconnected */
uint8_t ifno; /* Interface number */
- uint8_t funcaddr; /* USB function address */
int16_t crefs; /* Reference count on the driver instance */
uint16_t blocksize; /* Block size of USB mass storage device */
uint32_t nblocks; /* Number of blocks on the USB mass storage device */
@@ -930,7 +929,7 @@ static void usbhost_destroy(FAR void *arg)
/* Disconnect the USB host device */
- DRVR_DISCONNECT(priv->drvr, priv->funcaddr);
+ DRVR_DISCONNECT(priv->drvr);
/* And free the class instance. Hmmm.. this may execute on the worker
* thread and the work structure is part of what is getting freed. That
@@ -1741,15 +1740,6 @@ static int usbhost_connect(FAR struct usbhost_class_s *class,
{
udbg("usbhost_initvolume() failed: %d\n", ret);
}
- else
- {
- /* Save the function address (We will need it when we disconnect).
- * NOTE that address is available in the endpoint structures as
- * well.
- */
-
- priv->funcaddr = funcaddr;
- }
}
return ret;