Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-27 11:26:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix a recently introduced deadlock in some class drivers

Browse Source
This commit is contained in:
Gregory Nutt
2015-04-25 15:57:57 -06:00
parent 4de9bc7b6c
commit 329ae78583
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/usbhost/usbhost_hidkbd.c
+7 -2
View File
@@ -2165,6 +2165,11 @@ static int usbhost_close(FAR struct file *filep)
*/ */
usbhost_destroy(priv); usbhost_destroy(priv);
/* Skip giving the semaphore... it is no longer valid */
irqrestore(flags);
return OK;
} }
else /* if (priv->crefs == 1) */ else /* if (priv->crefs == 1) */
{ {
@@ -2173,12 +2178,12 @@ static int usbhost_close(FAR struct file *filep)
* signal that we use does not matter in this case. * signal that we use does not matter in this case.
*/ */
(void)kill(priv->pollpid, SIGUSR1); (void)kill(priv->pollpid, SIGALRM);
usbhost_givesem(&priv->exclsem);
} }
} }
} }
usbhost_givesem(&priv->exclsem);
irqrestore(flags); irqrestore(flags);
return OK; return OK;
} }
drivers/usbhost/usbhost_hidmouse.c
+8 -3
View File
@@ -2239,7 +2239,7 @@ static int usbhost_close(FAR struct file *filep)
{ {
/* Yes.. In either case, then the driver is no longer open */ /* Yes.. In either case, then the driver is no longer open */
priv->open = false; priv->open = false;
/* Check if the USB keyboard device is still connected. */ /* Check if the USB keyboard device is still connected. */
@@ -2254,6 +2254,11 @@ static int usbhost_close(FAR struct file *filep)
*/ */
usbhost_destroy(priv); usbhost_destroy(priv);
/* Skip giving the semaphore... it is no longer valid */
irqrestore(flags);
return OK;
} }
else /* if (priv->crefs == 1) */ else /* if (priv->crefs == 1) */
{ {
@@ -2262,12 +2267,12 @@ static int usbhost_close(FAR struct file *filep)
* signal that we use does not matter in this case. * signal that we use does not matter in this case.
*/ */
(void)kill(priv->pollpid, SIGUSR1); (void)kill(priv->pollpid, SIGALRM);
usbhost_givesem(&priv->exclsem);
} }
} }
} }
usbhost_givesem(&priv->exclsem);
irqrestore(flags); irqrestore(flags);
return OK; return OK;
} }