Skip to contentSkip to conversation

ASoC: fix davinci-sffsdr buglet

PATCH Applied David Brownell 2 participants 2 messages Jan 5, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: fix davinci-sffsdr buglet

From: David Brownell <[email protected]>

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.

---

Quoted 1 line

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(+)
sound/soc/davinci/davinci-sffsdr.c +4 -0
@@ -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");
Applied
#1 lore raw
Quoted 7 lines · David Brownell

From: David Brownell <[email protected]>

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.

Applied, thanks (note that you seem to have multiple subject lines in there, BTW).