diff options
| author | Andy Green <andy@openmoko.com> | 2009-01-29 14:27:22 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-01-29 14:27:22 +0000 |
| commit | 85c88b269be595609c7480ed98b3a9185ea7dc4d (patch) | |
| tree | a1b7f0b43bf5c5c214bf9d90223147137f67fae7 /sound | |
| parent | a55d56c1bedf6e3de68dbe25e5bf50b1e06f8ed8 (diff) | |
fix-alsa-bt-dai-registration-missing.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 9 | ||||
| -rw-r--r-- | sound/soc/soc-core.c | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c index 79b6b6c27d4..780d1131739 100644 --- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c @@ -637,6 +637,11 @@ static int __init neo1973_gta02_init(void) return -ENODEV; } + /* register bluetooth DAI here */ + ret = snd_soc_register_dai(&bt_dai); + if (ret) + return ret; + neo1973_gta02_snd_device = platform_device_alloc("soc-audio", -1); if (!neo1973_gta02_snd_device) return -ENOMEM; @@ -646,8 +651,10 @@ static int __init neo1973_gta02_init(void) neo1973_gta02_snd_devdata.dev = &neo1973_gta02_snd_device->dev; ret = platform_device_add(neo1973_gta02_snd_device); - if (ret) + if (ret) { platform_device_put(neo1973_gta02_snd_device); + return ret; + } /* Initialise GPIOs used by amp */ s3c2410_gpio_cfgpin(GTA02_GPIO_HP_IN, S3C2410_GPIO_OUTPUT); diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 62eda261155..ff66d47ab24 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -817,7 +817,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card) if (!found) { dev_dbg(card->dev, "DAI %s not registered\n", card->dai_link[i].cpu_dai->name); - return; + continue; } if (card->dai_link[i].cpu_dai->ac97_control) @@ -841,7 +841,7 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card) if (!found) { dev_dbg(card->dev, "DAI %s not registered\n", card->dai_link[i].codec_dai->name); - return; + continue; } } |