diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-28 14:24:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-28 14:24:34 -0700 |
| commit | 6b3a7c0f8a030561cb4eb5e905149938575e8085 (patch) | |
| tree | 5730e211e047256bf00e332855ca82844bb66b05 /sound/core/pcm.c | |
| parent | 45b5bed7bc02a7f04127ac32f8fe7117b6baa419 (diff) | |
| parent | 9dde3f92a7342e690f6f4a7ee8746d9b43d4c723 (diff) | |
| download | linux-6b3a7c0f8a030561cb4eb5e905149938575e8085.tar.gz linux-6b3a7c0f8a030561cb4eb5e905149938575e8085.tar.bz2 linux-6b3a7c0f8a030561cb4eb5e905149938575e8085.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: pcm: add more format names
sound: oss: fix uninitialized spinlock
ALSA: asihpi - Return hw error directly from oustream_write.
ASoC: soc-core: fix debugfs_pop_time file permissions
ALSA: hda - Add Sony VAIO quirk for ALC269
Diffstat (limited to 'sound/core/pcm.c')
| -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); |