[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Andy Green]

The following commit has been merged in the andy-tracking branch:
commit c1b03e4da22e8dd7a6caccb9e39a9201535ced11
Author: Tim Niemeyer <reddog at redlap.wired.rednet.mastersword.de>
Date:   Thu Mar 5 14:40:35 2009 +0000

    From b003024f41b34cc9a8442f7dab1b9ce099faf08b Mon Sep 17 00:00:00 2001
    Subject: [PATCH] fix-alsa-bt-dai-registration-missing

diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c
index a15b970..4efa350 100644
--- a/sound/soc/s3c24xx/neo1973_wm8753.c
+++ b/sound/soc/s3c24xx/neo1973_wm8753.c
@@ -677,6 +677,11 @@ static int __init neo1973_init(void)
 		return -ENODEV;
 	}
 
+	/* register bluetooth DAI here */
+	ret = snd_soc_register_dai(&bt_dai);
+	if (ret)
+		return ret;
+
 	neo1973_snd_device = platform_device_alloc("soc-audio", -1);
 	if (!neo1973_snd_device)
 		return -ENOMEM;
@@ -702,6 +707,7 @@ static void __exit neo1973_exit(void)
 {
 	DBG("Entered %s\n", __func__);
 
+	snd_soc_unregister_dai(&bt_dai);
 	i2c_del_driver(&lm4857_i2c_driver);
 	platform_device_unregister(neo1973_snd_device);
 }

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko