sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged in antmerlino/nuttx/mmcsd-bugfix (pull request #893)

Browse Source 
drivers/mmcsd: Fixes bug where thread gets deadlocked due to recursive call and addresses comment regarding events.

When initializing the MMCSD, if we are being told there is a card, but we fail to initialize it, we should not re-register for an insertion event as this will immediately cause us to call in again. Instead, we should register for a removal event and wait for the card to be removed and re-inserted.

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
Anthony Merlino 2019-06-13 01:27:02 +00:00 committed by Gregory Nutt
parent eab1b11d7d
commit 5cd2a1ae68
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/mmcsd/mmcsd_sdio.c
View File

@ -3094,9 +3094,6 @@ static int mmcsd_probe(FAR struct mmcsd_state_s *priv)
if (ret != OK) if (ret != OK)
{ {
ferr("ERROR: Failed to initialize card: %d\n", ret); ferr("ERROR: Failed to initialize card: %d\n", ret);
#ifdef CONFIG_MMCSD_HAVE_CARDDETECT
SDIO_CALLBACKENABLE(priv->dev, SDIOMEDIA_INSERTED);
#endif
} }
else else
{ {
@ -3130,6 +3127,19 @@ static int mmcsd_probe(FAR struct mmcsd_state_s *priv)
finfo("Capacity: %lu Kbytes\n", (unsigned long)(priv->capacity / 1024)); finfo("Capacity: %lu Kbytes\n", (unsigned long)(priv->capacity / 1024));
priv->mediachanged = true; priv->mediachanged = true;
}
}
/* In any event, we have probed this card */
priv->probed = true;
/* Regardless of whether or not a card was successfully initialized, there
* is appartently a card inserted. If it wasn't successfully initialized,
* there's nothing we can do about it now. Perhaps it's a bad card? The best
* we can do is wait for the card to be ejected and re-inserted. Then we
* can try to initialize again.
*/
#ifdef CONFIG_MMCSD_HAVE_CARDDETECT #ifdef CONFIG_MMCSD_HAVE_CARDDETECT
/* Set up to receive asynchronous, media removal events */ /* Set up to receive asynchronous, media removal events */
@ -3137,16 +3147,6 @@ static int mmcsd_probe(FAR struct mmcsd_state_s *priv)
SDIO_CALLBACKENABLE(priv->dev, SDIOMEDIA_EJECTED); SDIO_CALLBACKENABLE(priv->dev, SDIOMEDIA_EJECTED);
#endif #endif
} }
/* REVISIT: There is a problem here. If mmcsd_initialize() returns a
* failure, then no events are initialized.
*/
}
/* In any event, we have probed this card */
priv->probed = true;
}
else else
{ {
/* There is no card in the slot */ /* There is no card in the slot */