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

drivers: audio: Return -ENOTTY in xxx_ioctl() if not handled

Browse Source 
Signed-off-by: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com>
This commit is contained in:
Masayuki Ishikawa 2020-06-05 10:34:01 +09:00 committed by Xiang Xiao
parent ef30832e67
commit 4b9886fa29
6 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/audio/audio_null.c
View File

@ -737,6 +737,7 @@ static int null_cancelbuffer(FAR struct audio_lowerhalf_s *dev,
static int null_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd, static int null_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd,
unsigned long arg) unsigned long arg)
{ {
int ret = OK;
#ifdef CONFIG_AUDIO_DRIVER_SPECIFIC_BUFFERS #ifdef CONFIG_AUDIO_DRIVER_SPECIFIC_BUFFERS
FAR struct ap_buffer_info_s *bufinfo; FAR struct ap_buffer_info_s *bufinfo;
#endif #endif
@ -771,11 +772,12 @@ static int null_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd,
#endif #endif
default: default:
ret = -ENOTTY;
break; break;
} }
audinfo("Return OK\n"); audinfo("Return OK\n");
return OK; return ret;
} }
/**************************************************************************** /****************************************************************************

4
drivers/audio/cs43l22.c
View File

@ -1449,6 +1449,7 @@ static int cs43l22_cancelbuffer(FAR struct audio_lowerhalf_s *dev,
static int cs43l22_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd, static int cs43l22_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd,
unsigned long arg) unsigned long arg)
{ {
int ret = OK;
#ifdef CONFIG_AUDIO_DRIVER_SPECIFIC_BUFFERS #ifdef CONFIG_AUDIO_DRIVER_SPECIFIC_BUFFERS
FAR struct ap_buffer_info_s *bufinfo; FAR struct ap_buffer_info_s *bufinfo;
#endif #endif
@ -1486,11 +1487,12 @@ static int cs43l22_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd,
#endif #endif
default: default:
ret = -ENOTTY;
audinfo("Ignored\n"); audinfo("Ignored\n");
break; break;
} }
return OK; return ret;
} }
/**************************************************************************** /****************************************************************************

4
drivers/audio/cxd56.c
View File

@ -3307,6 +3307,7 @@ static int cxd56_cancelbuffer(FAR struct audio_lowerhalf_s *lower,
static int cxd56_ioctl(FAR struct audio_lowerhalf_s *lower, int cmd, static int cxd56_ioctl(FAR struct audio_lowerhalf_s *lower, int cmd,
unsigned long arg) unsigned long arg)
{ {
int ret = OK;
#ifdef CONFIG_AUDIO_DRIVER_SPECIFIC_BUFFERS #ifdef CONFIG_AUDIO_DRIVER_SPECIFIC_BUFFERS
FAR struct ap_buffer_info_s *bufinfo; FAR struct ap_buffer_info_s *bufinfo;
#endif #endif
@ -3329,11 +3330,12 @@ static int cxd56_ioctl(FAR struct audio_lowerhalf_s *lower, int cmd,
#endif #endif
default: default:
ret = -ENOTTY;
audinfo("Unhandled ioctl: %d\n", cmd); audinfo("Unhandled ioctl: %d\n", cmd);
break; break;
} }
return OK; return ret;
} }
/**************************************************************************** /****************************************************************************

4
drivers/audio/vs1053.c
View File

@ -1716,6 +1716,7 @@ static int vs1053_cancelbuffer(FAR struct audio_lowerhalf_s *lower,
static int vs1053_ioctl(FAR struct audio_lowerhalf_s *lower, int cmd, static int vs1053_ioctl(FAR struct audio_lowerhalf_s *lower, int cmd,
unsigned long arg) unsigned long arg)
{ {
int ret = OK;
#ifdef CONFIG_AUDIO_DRIVER_SPECIFIC_BUFFERS #ifdef CONFIG_AUDIO_DRIVER_SPECIFIC_BUFFERS
FAR struct ap_buffer_info_s *bufinfo; FAR struct ap_buffer_info_s *bufinfo;
#endif #endif
@ -1744,10 +1745,11 @@ static int vs1053_ioctl(FAR struct audio_lowerhalf_s *lower, int cmd,
#endif #endif
default: default:
ret = -ENOTTY;
break; break;
} }
return OK; return ret;
} }
/**************************************************************************** /****************************************************************************

4
drivers/audio/wm8776.c
View File

@ -988,6 +988,7 @@ static int wm8776_cancelbuffer(FAR struct audio_lowerhalf_s *dev,
static int wm8776_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd, static int wm8776_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd,
unsigned long arg) unsigned long arg)
{ {
int ret = OK;
#ifdef CONFIG_AUDIO_DRIVER_SPECIFIC_BUFFERS #ifdef CONFIG_AUDIO_DRIVER_SPECIFIC_BUFFERS
FAR struct ap_buffer_info_s *bufinfo; FAR struct ap_buffer_info_s *bufinfo;
#endif #endif
@ -1025,11 +1026,12 @@ static int wm8776_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd,
#endif #endif
default: default:
ret = -ENOTTY;
audinfo("Ignored\n"); audinfo("Ignored\n");
break; break;
} }
return OK; return ret;
} }
/**************************************************************************** /****************************************************************************

4
drivers/audio/wm8904.c
View File

@ -1832,6 +1832,7 @@ static int wm8904_cancelbuffer(FAR struct audio_lowerhalf_s *dev,
static int wm8904_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd, static int wm8904_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd,
unsigned long arg) unsigned long arg)
{ {
int ret = OK;
#ifdef CONFIG_AUDIO_DRIVER_SPECIFIC_BUFFERS #ifdef CONFIG_AUDIO_DRIVER_SPECIFIC_BUFFERS
FAR struct ap_buffer_info_s *bufinfo; FAR struct ap_buffer_info_s *bufinfo;
#endif #endif
@ -1869,11 +1870,12 @@ static int wm8904_ioctl(FAR struct audio_lowerhalf_s *dev, int cmd,
#endif #endif
default: default:
ret = -ENOTTY;
audinfo("Ignored\n"); audinfo("Ignored\n");
break; break;
} }
return OK; return ret;
} }
/**************************************************************************** /****************************************************************************