From: Vasily Khoruzhick <anarsoul@gmail.com>
Date: Tue, 7 Sep 2010 14:04:15 +0000 (+0300)
Subject: ASoC: rx1950: check that machine is rx1950 in glue driver
X-Git-Tag: v2.6.37-rc1~82^2~8^2~124
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=dedc3cf54eb746b05fef2e1ab51d3454d1b61c98

ASoC: rx1950: check that machine is rx1950 in glue driver

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/sound/soc/s3c24xx/rx1950_uda1380.c b/sound/soc/s3c24xx/rx1950_uda1380.c
index 2a16113231fd..0f6e806834bc 100644
--- a/sound/soc/s3c24xx/rx1950_uda1380.c
+++ b/sound/soc/s3c24xx/rx1950_uda1380.c
@@ -40,6 +40,8 @@
 
 #include <mach/regs-clock.h>
 
+#include <asm/mach-types.h>
+
 #include "s3c-dma.h"
 #include "s3c24xx-i2s.h"
 #include "../codecs/uda1380.h"
@@ -274,6 +276,9 @@ static int __init rx1950_init(void)
 {
 	int ret;
 
+	if (!machine_is_rx1950())
+		return -ENODEV;
+
 	/* configure some gpios */
 	ret = gpio_request(S3C2410_GPA(1), "speaker-power");
 	if (ret)