Commit 5cf1c00b0ef3ba964b2ad268a55c278cf43f798f

Authored by David Brownell
Committed by Mark Brown
1 parent 6a94cb7306

ASoC: fix davinci-sffsdr 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@users.sourceforge.net>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Showing 1 changed file with 4 additions and 0 deletions Side-by-side Diff

sound/soc/davinci/davinci-sffsdr.c
... ... @@ -24,6 +24,7 @@
24 24 #include <sound/soc-dapm.h>
25 25  
26 26 #include <asm/dma.h>
  27 +#include <asm/mach-types.h>
27 28 #include <asm/plat-sffsdr/sffsdr-fpga.h>
28 29  
29 30 #include <mach/mcbsp.h>
... ... @@ -114,6 +115,9 @@
114 115 static int __init sffsdr_init(void)
115 116 {
116 117 int ret;
  118 +
  119 + if (!machine_is_sffsdr())
  120 + return -EINVAL;
117 121  
118 122 sffsdr_snd_device = platform_device_alloc("soc-audio", 0);
119 123 if (!sffsdr_snd_device) {