phone-side
/
nuttx-bb
9
0
Fork 0
Code Releases Activity

Fix possibly deadlock condition 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@3601 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo 2011-05-13 03:33:03 +00:00
parent 9912ce76d0
commit f5f95ed259
2 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
misc/drivers/rtl8187x/rtl8187x.c
View File

@ -986,36 +986,33 @@ static inline int rtl8187x_devinit(FAR struct rtl8187x_state_s *priv)
{
rtl8187x_takesem(&priv->exclsem);
/* Decrement the reference count */
priv->crefs--;
/* Handle a corner case where (1) open() has been called so the
* reference count is > 2, but the device has been disconnected.
* reference count was > 2, but the device has been disconnected.
* In this case, the class instance needs to persist until close()
* is called.
*/
if (priv->crefs <= 2 && priv->disconnected)
if (priv->crefs <= 1 && priv->disconnected)
{
/* We don't have to give the semaphore because it will be
* destroyed when usb_destroy is called.
/* The will cause the enumeration logic to disconnect
* the class driver.
*/
ret = -ENODEV;
}
else
{
/* Ready for normal operation as a network device */
uvdbg("Successfully initialized\n");
priv->crefs--;
rtl8187x_givesem(&priv->exclsem);
}
}
/* Release the semaphore... there is a race condition here.
* Decrementing the reference count and releasing the semaphore
* allows usbhost_destroy() to execute (on the worker thread);
* the class driver instance could get destoryed before we are
* ready to handle it!
*/
/* Disconnect on any errors detected during volume initialization */
if (ret != OK)
{
udbg("ERROR! Aborting: %d\n", ret);
rtl8187x_destroy(priv);
rtl8187x_givesem(&priv->exclsem);
}
return ret;
@ -1375,6 +1372,10 @@ errout:
* 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.
* - If this function returns an error, the USB host controller driver

37
nuttx/drivers/usbhost/usbhost_storage.c
View File

@ -937,10 +937,6 @@ 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.
*
@ -1288,28 +1284,33 @@ static inline int usbhost_initvolume(FAR struct usbhost_state_s *priv)
usbhost_takesem(&priv->exclsem);
DEBUGASSERT(priv->crefs >= 2);
/* Decrement the reference count */
priv->crefs--;
/* Handle a corner case where (1) open() has been called so the
* reference count is > 2, but the device has been disconnected.
* reference count was > 2, but the device has been disconnected.
* In this case, the class instance needs to persist until close()
* is called.
*/
if (priv->crefs <= 2 && priv->disconnected)
if (priv->crefs <= 1 && priv->disconnected)
{
/* We don't have to give the semaphore because it will be
* destroyed when usb_destroy is called.
/* The will cause the enumeration logic to disconnect
* the class driver.
*/
ret = -ENODEV;
}
else
{
/* Ready for normal operation as a block device driver */
uvdbg("Successfully initialized\n");
priv->crefs--;
usbhost_givesem(&priv->exclsem);
}
/* Release the semaphore... there is a race condition here.
* Decrementing the reference count and releasing the semaphore
* allows usbhost_destroy() to execute (on the worker thread);
* the class driver instance could get destoryed before we are
* ready to handle it!
*/
usbhost_givesem(&priv->exclsem);
}
return ret;
@ -1671,6 +1672,10 @@ static FAR struct usbhost_class_s *usbhost_create(FAR struct usbhost_driver_s *d
* 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.
* - If this function returns an error, the USB host controller driver