tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 6b3a7c0f 45b5bed7

+14 -4
+6
sound/core/pcm.c
··· 203 203 FORMAT(S18_3BE), 204 204 FORMAT(U18_3LE), 205 205 FORMAT(U18_3BE), 206 + FORMAT(G723_24), 207 + FORMAT(G723_24_1B), 208 + FORMAT(G723_40), 209 + FORMAT(G723_40_1B), 206 210 }; 207 211 208 212 const char *snd_pcm_format_name(snd_pcm_format_t format) 209 213 { 214 + if (format >= ARRAY_SIZE(snd_pcm_format_names)) 215 + return "Unknown"; 210 216 return snd_pcm_format_names[format]; 211 217 } 212 218 EXPORT_SYMBOL_GPL(snd_pcm_format_name);
+1 -1
sound/oss/sound_timer.c
··· 26 26 static volatile unsigned long usecs_per_tmr; /* Length of the current interval */ 27 27 28 28 static struct sound_lowlev_timer *tmr; 29 - static spinlock_t lock; 29 + static DEFINE_SPINLOCK(lock); 30 30 31 31 static unsigned long tmr2ticks(int tmr_value) 32 32 {
+5 -2
sound/pci/asihpi/hpi6205.c
··· 941 941 942 942 } 943 943 944 - static u32 outstream_get_space_available(struct hpi_hostbuffer_status 945 - *status) 944 + static u32 outstream_get_space_available(struct hpi_hostbuffer_status *status) 946 945 { 947 946 return status->size_in_bytes - (status->host_index - 948 947 status->dSP_index); ··· 986 987 /* write it */ 987 988 phm->function = HPI_OSTREAM_WRITE; 988 989 hw_message(pao, phm, phr); 990 + 991 + if (phr->error) 992 + return; 993 + 989 994 /* update status information that the DSP would typically 990 995 * update (and will update next time the DSP 991 996 * buffer update task reads data from the host BBM buffer)
+1
sound/pci/hda/patch_realtek.c
··· 14467 14467 14468 14468 static struct snd_pci_quirk alc269_fixup_tbl[] = { 14469 14469 SND_PCI_QUIRK(0x104d, 0x9071, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), 14470 + SND_PCI_QUIRK(0x104d, 0x9077, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), 14470 14471 {} 14471 14472 }; 14472 14473
+1 -1
sound/soc/soc-core.c
··· 251 251 printk(KERN_WARNING 252 252 "ASoC: Failed to create codec register debugfs file\n"); 253 253 254 - codec->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0744, 254 + codec->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0644, 255 255 codec->debugfs_codec_root, 256 256 &codec->pop_time); 257 257 if (!codec->debugfs_pop_time)