diff --git a/audio/audio.c b/audio/audio.c index 716a1ac7c0d..c19973c6985 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -556,8 +556,8 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg) { /* Perform a simple apb_free operation */ - DEBUGASSERT(bufdesc->u.pBuffer != NULL); - apb_free(bufdesc->u.pBuffer); + DEBUGASSERT(bufdesc->u.buffer != NULL); + apb_free(bufdesc->u.buffer); ret = sizeof(struct audio_buf_desc_s); } } @@ -575,7 +575,7 @@ static int audio_ioctl(FAR struct file *filep, int cmd, unsigned long arg) DEBUGASSERT(lower->ops->enqueuebuffer != NULL); bufdesc = (FAR struct audio_buf_desc_s *) arg; - ret = lower->ops->enqueuebuffer(lower, bufdesc->u.pBuffer); + ret = lower->ops->enqueuebuffer(lower, bufdesc->u.buffer); } break; diff --git a/audio/audio_comp.c b/audio/audio_comp.c index 494de482b2c..5f9b3e2024a 100644 --- a/audio/audio_comp.c +++ b/audio/audio_comp.c @@ -597,7 +597,7 @@ static int audio_comp_freebuffer(FAR struct audio_lowerhalf_s *dev, if (ret == -ENOTTY) { - apb_free(bufdesc->u.pBuffer); + apb_free(bufdesc->u.buffer); ret = sizeof(*bufdesc); } diff --git a/include/nuttx/audio/audio.h b/include/nuttx/audio/audio.h index 5be6431c17f..3a364f78a9d 100644 --- a/include/nuttx/audio/audio.h +++ b/include/nuttx/audio/audio.h @@ -465,8 +465,8 @@ struct audio_buf_desc_s uint16_t numbytes; /* Number of bytes to allocate */ union { - FAR struct ap_buffer_s *pBuffer; /* Buffer to free / enqueue */ - FAR struct ap_buffer_s **ppBuffer; /* Pointer to receive allocated buffer */ + FAR struct ap_buffer_s *buffer; /* Buffer to free / enqueue */ + FAR struct ap_buffer_s **pbuffer; /* Pointer to receive allocated buffer */ } u; }; diff --git a/libs/libc/audio/lib_buffer.c b/libs/libc/audio/lib_buffer.c index 88fd7353830..712b321dd55 100644 --- a/libs/libc/audio/lib_buffer.c +++ b/libs/libc/audio/lib_buffer.c @@ -104,17 +104,17 @@ int apb_alloc(FAR struct audio_buf_desc_s *bufdesc) int ret; struct ap_buffer_s *apb; - DEBUGASSERT(bufdesc->u.ppBuffer != NULL); + DEBUGASSERT(bufdesc->u.pbuffer != NULL); /* Perform a user mode allocation */ bufsize = sizeof(struct ap_buffer_s) + bufdesc->numbytes; apb = lib_umalloc(bufsize); - *bufdesc->u.ppBuffer = apb; + *bufdesc->u.pbuffer = apb; /* Test if the allocation was successful or not */ - if (*bufdesc->u.ppBuffer == NULL) + if (*bufdesc->u.pbuffer == NULL) { ret = -ENOMEM; }