Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 09:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-2.6.32' into for-2.6.33

Browse Source
This commit is contained in:
Mark Brown 2009-10-19 16:15:35 +01:00
commit 9927f32771
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/soc/soc-core.c
View File

@ -795,6 +795,9 @@ static int soc_resume(struct device *dev)
#define soc_resume NULL #define soc_resume NULL
#endif #endif
static struct snd_soc_dai_ops null_dai_ops = {
};
static void snd_soc_instantiate_card(struct snd_soc_card *card) static void snd_soc_instantiate_card(struct snd_soc_card *card)
{ {
struct platform_device *pdev = container_of(card->dev, struct platform_device *pdev = container_of(card->dev,
@ -838,6 +841,11 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card)
ac97 = 1; ac97 = 1;
} }
for (i = 0; i < card->num_links; i++) {
if (!card->dai_link[i].codec_dai->ops)
card->dai_link[i].codec_dai->ops = &null_dai_ops;
}
/* If we have AC97 in the system then don't wait for the /* If we have AC97 in the system then don't wait for the
* codec. This will need revisiting if we have to handle * codec. This will need revisiting if we have to handle
* systems with mixed AC97 and non-AC97 parts. Only check for * systems with mixed AC97 and non-AC97 parts. Only check for
@ -2332,9 +2340,6 @@ static int snd_soc_unregister_card(struct snd_soc_card *card)
return 0; return 0;
} }
static struct snd_soc_dai_ops null_dai_ops = {
};
/** /**
* snd_soc_register_dai - Register a DAI with the ASoC core * snd_soc_register_dai - Register a DAI with the ASoC core
* *