diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-01-29 13:08:20 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-01-29 13:14:21 +0000 |
| commit | 9e70c1f099c6977d3928879e64fa6af7f903b7b0 (patch) | |
| tree | 922a0cd530f5f24fda569c5bd6f109f37218a4c9 /sound | |
| parent | 43d50807dbf47a139f83660fec14aebe936b3c80 (diff) | |
| download | linux-3.10-9e70c1f099c6977d3928879e64fa6af7f903b7b0.tar.gz linux-3.10-9e70c1f099c6977d3928879e64fa6af7f903b7b0.tar.bz2 linux-3.10-9e70c1f099c6977d3928879e64fa6af7f903b7b0.zip | |
ASoC: Fix null string usage with WM8753 DAIs
The WM8753 driver multiplexes the DAI structures it exposes to the
outside world, leaving them uninitialised until the codec probes. Since
the DAI name is used during the registration and setup process provide a
dummy name.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8753.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 6c21b50c937..77620ab9875 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -1451,7 +1451,14 @@ static const struct snd_soc_dai wm8753_all_dai[] = { }, }; -struct snd_soc_dai wm8753_dai[2]; +struct snd_soc_dai wm8753_dai[] = { + { + .name = "WM8753 DAI 0", + }, + { + .name = "WM8753 DAI 1", + }, +}; EXPORT_SYMBOL_GPL(wm8753_dai); static void wm8753_set_dai_mode(struct snd_soc_codec *codec, unsigned int mode) |