[PATCH][sound/SOC] Do not register platform sound device unconditionally

From: Juergen Beisert
Date: Mon Nov 28 2011 - 09:12:31 EST


Registering a SOC device and also changing register unconditionally fails on
kernels which support more than one machine in one binary. Do it only if the
platform matches.

Signed-off-by: Juergen Beisert <jbe@xxxxxxxxxxxxxx>

diff --git a/sound/soc/imx/mx27vis-aic32x4.c b/sound/soc/imx/mx27vis-aic32x4.c
index 054110b..c5cfb8a 100644
--- a/sound/soc/imx/mx27vis-aic32x4.c
+++ b/sound/soc/imx/mx27vis-aic32x4.c
@@ -96,6 +96,10 @@ static int __init mx27vis_aic32x4_init(void)
{
int ret;

+ if (!machine_is_imx27_visstrim_m10())
+ /* return happy. We run on a totally different machine */
+ return 0;
+
mx27vis_aic32x4_snd_device = platform_device_alloc("soc-audio", -1);
if (!mx27vis_aic32x4_snd_device)
return -ENOMEM;

--
Pengutronix e.K. | Juergen Beisert |
Linux Solutions for Science and Industry | http://www.pengutronix.de/ |
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/