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

audio: Return audio_lowerhalf_s pointer instead error code in audio_comp_initialize

Browse Source
This commit is contained in:
zhangyuebin 2021-11-09 14:47:49 +08:00 committed by Alan Carvalho de Assis
parent dd70d29d4e
commit f3d20abe07
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
audio/audio_comp.c
View File

@ -919,14 +919,15 @@ static void audio_comp_callback(FAR void *arg, uint16_t reason,
* ... - The list of the lower half audio driver.
*
* Returned Value:
* Zero on success; a negated errno value on failure.
* struct audio_lowerhalf_s* on success; NULL on failure.
*
* Note
* The variable argument list must be NULL terminated.
*
****************************************************************************/
int audio_comp_initialize(FAR const char *name, ...)
FAR struct audio_lowerhalf_s *audio_comp_initialize(FAR const char *name,
...)
{
FAR struct audio_comp_priv_s *priv;
va_list ap;
@ -936,7 +937,7 @@ int audio_comp_initialize(FAR const char *name, ...)
priv = kmm_zalloc(sizeof(struct audio_comp_priv_s));
if (priv == NULL)
{
return ret;
return NULL;
}
priv->export.ops = &g_audio_comp_ops;
@ -974,11 +975,11 @@ int audio_comp_initialize(FAR const char *name, ...)
goto free_lower;
}
return OK;
return &priv->export;
free_lower:
kmm_free(priv->lower);
free_priv:
kmm_free(priv);
return ret;
return NULL;
}

5
include/nuttx/audio/audio_comp.h
View File

@ -65,14 +65,15 @@ extern "C"
* ... - The list of the lower half audio driver.
*
* Returned Value:
* Zero on success; a negated errno value on failure.
* struct audio_lowerhalf_s* on success; NULL on failure.
*
* Note
* The variable argument list must be NULL terminated.
*
****************************************************************************/
int audio_comp_initialize(FAR const char *name, ...);
FAR struct audio_lowerhalf_s *audio_comp_initialize(FAR const char *name,
...);
#undef EXTERN
#ifdef __cplusplus