[alsa-devel] [patch 2.6.28-git] ASoC: fix davinci-sffsdr buglet

[David Brownell]

From: David Brownell <dbrownell at users.sourceforge.net>

DaVinci ASoC: fix multiboard buglet

Minor bugfix:  now that DaVinci kernels can support multiple
boards, board-specific ASoC components need to verify they're
running on the right board before initializing.

Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Kevin Hilman <khilman at deeprootsystems.com>
---
From the DaVinci tree ... didn't realize davinci-sffsdr.c
was already queued for mainline.

 sound/soc/davinci/davinci-sffsdr.c |    4 ++++
 1 file changed, 4 insertions(+)

--- a/sound/soc/davinci/davinci-sffsdr.c
+++ b/sound/soc/davinci/davinci-sffsdr.c
@@ -24,6 +24,7 @@
 #include <sound/soc-dapm.h>
 
 #include <asm/dma.h>
+#include <asm/mach-types.h>
 #include <asm/plat-sffsdr/sffsdr-fpga.h>
 
 #include <mach/mcbsp.h>
@@ -115,6 +116,9 @@ static int __init sffsdr_init(void)
 {
 	int ret;
 
+	if (!machine_is_sffsdr())
+		return -EINVAL;
+
 	sffsdr_snd_device = platform_device_alloc("soc-audio", 0);
 	if (!sffsdr_snd_device) {
 		printk(KERN_ERR "platform device allocation failed\n");