[1/1] sound/aoa/codecs/onyx.c: use static const for texts
diff mbox

Message ID 20140527091218.246af6a3346fa67930e41f18@skynet.be
State Accepted
Commit 00a6d7b6762c27d441e9ac8faff36384bc0fc180
Delegated to: Takashi Iwai
Headers show

Commit Message

Fabian Frederick May 27, 2014, 7:12 a.m. UTC
'texts' is only used as source in strcpy

Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiway@suse.de>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
This is untested.

 sound/aoa/codecs/onyx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Takashi Iwai May 27, 2014, 10:01 a.m. UTC | #1
At Tue, 27 May 2014 09:12:18 +0200,
Fabian Frederick wrote:
> 
> 'texts' is only used as source in strcpy
> 
> Cc: Johannes Berg <johannes@sipsolutions.net>
> Cc: Jaroslav Kysela <perex@perex.cz>
> Cc: Takashi Iwai <tiway@suse.de>
> Signed-off-by: Fabian Frederick <fabf@skynet.be>

Thanks, applied.


Takashi

> ---
> This is untested.
> 
>  sound/aoa/codecs/onyx.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c
> index f01bffb..401107b 100644
> --- a/sound/aoa/codecs/onyx.c
> +++ b/sound/aoa/codecs/onyx.c
> @@ -241,7 +241,7 @@ static struct snd_kcontrol_new inputgain_control = {
>  static int onyx_snd_capture_source_info(struct snd_kcontrol *kcontrol,
>  	struct snd_ctl_elem_info *uinfo)
>  {
> -	static char *texts[] = { "Line-In", "Microphone" };
> +	static const char * const texts[] = { "Line-In", "Microphone" };
>  
>  	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
>  	uinfo->count = 1;
> -- 
> 1.9.1
> 
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>

Patch
diff mbox

diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c
index f01bffb..401107b 100644
--- a/sound/aoa/codecs/onyx.c
+++ b/sound/aoa/codecs/onyx.c
@@ -241,7 +241,7 @@  static struct snd_kcontrol_new inputgain_control = {
 static int onyx_snd_capture_source_info(struct snd_kcontrol *kcontrol,
 	struct snd_ctl_elem_info *uinfo)
 {
-	static char *texts[] = { "Line-In", "Microphone" };
+	static const char * const texts[] = { "Line-In", "Microphone" };
 
 	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
 	uinfo->count = 1;