diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-26 01:04:10 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-26 01:04:10 +0000 |
| commit | 54150a8f62d57bd3af5efce1439ba3c29e20f07f (patch) | |
| tree | 4c791787398c9f76ccd9c8a56e1dd139c2a4e8e4 /nuttx/drivers | |
| parent | c62abcf9c8c26757ac5e6fbf0fd9813f1ba087a6 (diff) | |
| download | px4-nuttx-54150a8f62d57bd3af5efce1439ba3c29e20f07f.tar.gz px4-nuttx-54150a8f62d57bd3af5efce1439ba3c29e20f07f.tar.bz2 px4-nuttx-54150a8f62d57bd3af5efce1439ba3c29e20f07f.zip | |
Incorporate changes from Uros Platise
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3419 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers')
| -rw-r--r-- | nuttx/drivers/mmcsd/mmcsd_sdio.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nuttx/drivers/mmcsd/mmcsd_sdio.c b/nuttx/drivers/mmcsd/mmcsd_sdio.c index 61bbb417a..3fd7b0847 100644 --- a/nuttx/drivers/mmcsd/mmcsd_sdio.c +++ b/nuttx/drivers/mmcsd/mmcsd_sdio.c @@ -2033,7 +2033,7 @@ static void mmcsd_mediachange(FAR void *arg) DEBUGASSERT(priv); /* Is there a card present in the slot? */ - + mmcsd_takesem(priv); if (SDIO_PRESENT(priv->dev)) { @@ -2688,7 +2688,9 @@ static int mmcsd_probe(FAR struct mmcsd_state_s *priv) if (ret != OK) { fdbg("ERROR: Failed to initialize card: %d\n", ret); +#ifdef CONFIG_MMCSD_HAVECARDDETECT SDIO_CALLBACKENABLE(priv->dev, SDIOMEDIA_INSERTED); +#endif } else { @@ -2738,7 +2740,9 @@ static int mmcsd_probe(FAR struct mmcsd_state_s *priv) /* There is no card in the slot */ fvdbg("No card\n"); +#ifdef CONFIG_MMCSD_HAVECARDDETECT SDIO_CALLBACKENABLE(priv->dev, SDIOMEDIA_INSERTED); +#endif ret = -ENODEV; } |