Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b3a7c0f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 45b5bed7 9dde3f92

sound/core/pcm.c

+6 −0
Original line number Diff line number Diff line
@@ -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);

sound/oss/sound_timer.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static unsigned long prev_event_time; 
static volatile unsigned long usecs_per_tmr;	/* Length of the current interval */



static struct sound_lowlev_timer *tmr;

static spinlock_t lock;

static DEFINE_SPINLOCK(lock);



static unsigned long tmr2ticks(int tmr_value)

{

sound/pci/asihpi/hpi6205.c

+5 −2
Original line number Diff line number Diff line
@@ -941,8 +941,7 @@ static void outstream_host_buffer_free(struct hpi_adapter_obj *pao, 


}



static u32 outstream_get_space_available(struct hpi_hostbuffer_status

	*status)

static u32 outstream_get_space_available(struct hpi_hostbuffer_status *status)

{

	return status->size_in_bytes - (status->host_index -

		status->dSP_index);
@@ -987,6 +986,10 @@ static void outstream_write(struct hpi_adapter_obj *pao, 
		/* write it */

		phm->function = HPI_OSTREAM_WRITE;

		hw_message(pao, phm, phr);



		if (phr->error)

			return;



		/* update status information that the DSP would typically

		 * update (and will update next time the DSP

		 * buffer update task reads data from the host BBM buffer)

sound/pci/hda/patch_realtek.c

+1 −0
Original line number Diff line number Diff line
@@ -14467,6 +14467,7 @@ static const struct alc_fixup alc269_fixups[] = { 














static struct snd_pci_quirk alc269_fixup_tbl[] = {















	SND_PCI_QUIRK(0x104d, 0x9071, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),













	SND_PCI_QUIRK(0x104d, 0x9077, "Sony VAIO", ALC269_FIXUP_SONY_VAIO),















	{}















};















































sound/soc/soc-core.c



+1
−1




























Original line number
Diff line number
Diff line








@@ -251,7 +251,7 @@ static void soc_init_codec_debugfs(struct snd_soc_codec *codec)













		printk(KERN_WARNING















		       "ASoC: Failed to create codec register debugfs file\n");





























	codec->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0744,













	codec->debugfs_pop_time = debugfs_create_u32("dapm_pop_time", 0644,















						     codec->debugfs_codec_root,















						     &codec->pop_time);















	if (!codec->debugfs_pop_time)