From: David Brownell <dbrownell@users.sourceforge.net> Date: Mon, 5 Jan 2009 10:08:30 +0000 (-0800) Subject: ASoC: fix davinci-sffsdr buglet X-Git-Tag: firefly_0821_release~14583^2~177^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5cf1c00b0ef3ba964b2ad268a55c278cf43f798f;p=firefly-linux-kernel-4.4.55.git 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> --- 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 @@ #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");