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

Commit 20ed0938 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.39' into for-2.6.40

parents e1a02066 9ab88434

sound/soc/mid-x86/sst_platform.c

+6 −0
Original line number Diff line number Diff line
@@ -380,6 +380,11 @@ static int sst_platform_pcm_hw_params(struct snd_pcm_substream *substream, 
	return 0;

}



static int sst_platform_pcm_hw_free(struct snd_pcm_substream *substream)

{

	return snd_pcm_lib_free_pages(substream);

}



static struct snd_pcm_ops sst_platform_ops = {

	.open = sst_platform_open,

	.close = sst_platform_close,
@@ -388,6 +393,7 @@ static struct snd_pcm_ops sst_platform_ops = { 
	.trigger = sst_platform_pcm_trigger,

	.pointer = sst_platform_pcm_pointer,

	.hw_params = sst_platform_pcm_hw_params,

	.hw_free = sst_platform_pcm_hw_free,

};



static void sst_pcm_free(struct snd_pcm *pcm)

sound/soc/soc-core.c

+2 −0
Original line number Diff line number Diff line
@@ -3356,6 +3356,8 @@ int snd_soc_register_card(struct snd_soc_card *card) 
	if (!card->name || !card->dev)

		return -EINVAL;



	dev_set_drvdata(card->dev, card);



	snd_soc_initialize_card_lists(card);



	soc_init_card_debugfs(card);