diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-09-03 22:38:52 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-03 22:38:52 +0200 |
| commit | 68885a3ff38ed51fa02f241feb405c9922a90ee0 (patch) | |
| tree | 2fc626df39d5e0e1f6b065238141f7d49187c737 /sound/core | |
| parent | ALSA: usb-audio: add BOSS ME-25 support (diff) | |
| parent | ALSA: usb-audio: fix detection of vendor-specific device protocol settings (diff) | |
| download | linux-68885a3ff38ed51fa02f241feb405c9922a90ee0.tar.xz linux-68885a3ff38ed51fa02f241feb405c9922a90ee0.zip | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/pcm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/core/pcm.c b/sound/core/pcm.c index cbe815dfbdc8..204af48c5cc1 100644 --- a/sound/core/pcm.c +++ b/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); |