diff options
author | David Brownell <dbrownell@users.sourceforge.net> | 2009-01-05 05:08:30 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-01-05 08:09:31 -0500 |
commit | 5cf1c00b0ef3ba964b2ad268a55c278cf43f798f (patch) | |
tree | 438757a395cb40717b9d92801a8f907b0191d1d7 /sound | |
parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) |
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>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/davinci/davinci-sffsdr.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/davinci/davinci-sffsdr.c b/sound/soc/davinci/davinci-sffsdr.c index f67579d52765..4935d1bcbd8d 100644 --- a/sound/soc/davinci/davinci-sffsdr.c +++ b/sound/soc/davinci/davinci-sffsdr.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <sound/soc-dapm.h> | 24 | #include <sound/soc-dapm.h> |
25 | 25 | ||
26 | #include <asm/dma.h> | 26 | #include <asm/dma.h> |
27 | #include <asm/mach-types.h> | ||
27 | #include <asm/plat-sffsdr/sffsdr-fpga.h> | 28 | #include <asm/plat-sffsdr/sffsdr-fpga.h> |
28 | 29 | ||
29 | #include <mach/mcbsp.h> | 30 | #include <mach/mcbsp.h> |
@@ -115,6 +116,9 @@ static int __init sffsdr_init(void) | |||
115 | { | 116 | { |
116 | int ret; | 117 | int ret; |
117 | 118 | ||
119 | if (!machine_is_sffsdr()) | ||
120 | return -EINVAL; | ||
121 | |||
118 | sffsdr_snd_device = platform_device_alloc("soc-audio", 0); | 122 | sffsdr_snd_device = platform_device_alloc("soc-audio", 0); |
119 | if (!sffsdr_snd_device) { | 123 | if (!sffsdr_snd_device) { |
120 | printk(KERN_ERR "platform device allocation failed\n"); | 124 | printk(KERN_ERR "platform device allocation failed\n"); |