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

drivers/mmcsd: Handle the failure correctly in mmcsd_slotinitialize

Browse Source 
1.Return -ENOMEM directly if kmm_malloc return NULL
2.Call nxsem_destroy if the initialization can't succeed

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2021-09-05 21:52:28 +08:00 committed by Alan Carvalho de Assis
parent 7312a553bb
commit c1f9d2c2d5
1 changed files with 53 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/mmcsd/mmcsd_sdio.c
View File

@ -229,7 +229,7 @@ static void mmcsd_mediachange(FAR void *arg);
static int mmcsd_widebus(FAR struct mmcsd_state_s *priv);
#ifdef CONFIG_MMCSD_MMCSUPPORT
static int mmcsd_mmcinitialize(FAR struct mmcsd_state_s *priv);
static int mmcsd_read_csd (FAR struct mmcsd_state_s *priv);
static int mmcsd_read_csd(FAR struct mmcsd_state_s *priv);
#endif
static int mmcsd_sdinitialize(FAR struct mmcsd_state_s *priv);
static int mmcsd_cardidentify(FAR struct mmcsd_state_s *priv);
@ -3668,12 +3668,8 @@ static int mmcsd_hwinitialize(FAR struct mmcsd_state_s *priv)
static void mmcsd_hwuninitialize(FAR struct mmcsd_state_s *priv)
{
if (priv)
{
mmcsd_removed(priv);
SDIO_RESET(priv->dev);
kmm_free(priv);
}
}
/****************************************************************************
@ -3715,8 +3711,11 @@ int mmcsd_slotinitialize(int minor, FAR struct sdio_dev_s *dev)
priv = (FAR struct mmcsd_state_s *)
kmm_malloc(sizeof(struct mmcsd_state_s));
if (priv)
if (priv == NULL)
{
return -ENOMEM;
}
/* Initialize the MMC/SD state structure */
memset(priv, 0, sizeof(struct mmcsd_state_s));
@ -3783,7 +3782,6 @@ int mmcsd_slotinitialize(int minor, FAR struct sdio_dev_s *dev)
ferr("ERROR: register_blockdriver failed: %d\n", ret);
goto errout_with_buffers;
}
}
return OK;
@ -3792,10 +3790,9 @@ errout_with_buffers:
rwb_uninitialize(&priv->rwbuffer);
errout_with_hwinit:
#endif
mmcsd_hwuninitialize(priv); /* This will free the private data structure */
return ret;
mmcsd_hwuninitialize(priv);
errout_with_alloc:
nxsem_destroy(&priv->sem);
kmm_free(priv);
return ret;
}