diff --git a/[refs] b/[refs] index 71b805cf5cd5..2ed14b3655da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3182c8a72b31414e043184a97b0d5d3c0d590168 +refs/heads/master: 7a28826ac73d31a379d93785d8fbd24ab492b0bd diff --git a/trunk/sound/core/pcm.c b/trunk/sound/core/pcm.c index cbe815dfbdc8..204af48c5cc1 100644 --- a/trunk/sound/core/pcm.c +++ b/trunk/sound/core/pcm.c @@ -203,10 +203,16 @@ static char *snd_pcm_format_names[] = { FORMAT(S18_3BE), FORMAT(U18_3LE), FORMAT(U18_3BE), + FORMAT(G723_24), + FORMAT(G723_24_1B), + FORMAT(G723_40), + FORMAT(G723_40_1B), }; const char *snd_pcm_format_name(snd_pcm_format_t format) { + if (format >= ARRAY_SIZE(snd_pcm_format_names)) + return "Unknown"; return snd_pcm_format_names[format]; } EXPORT_SYMBOL_GPL(snd_pcm_format_name);