commit ccba0d6aca312f3351d095bb6de48a8c76bbf360
author Linux Build Service Account <lnxbuild@localhost> Mon Sep 17 02:53:28 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Sep 17 02:53:26 2012 -0700
tree 195d19a5641e1a29955aaaf9b2d51d7d832b2494
parent 6f901e08b148b3b15bd7bc1ef3adc86cbc52dd2c
parent f993eac79891cf519f7a6ab8df274467aa9b273e

Merge "ASoC: apq8064: Enhance the machine type check for apq8064 devices"

sound/soc/msm/apq8064.c

diff --git a/sound/soc/msm/apq8064.c b/sound/soc/msm/apq8064.c
index e46064b..1041818 100644
--- a/sound/soc/msm/apq8064.c
+++ b/sound/soc/msm/apq8064.c
@@ -2036,7 +2036,8 @@
 	int ret;
 	u32	version = socinfo_get_platform_version();
 	if (!cpu_is_apq8064() || (socinfo_get_id() == 130) ||
-		SOCINFO_VERSION_MINOR(version) == 1) {
+		(machine_is_apq8064_mtp() &&
+		(SOCINFO_VERSION_MINOR(version) == 1))) {
 		pr_info("%s: Not APQ8064 in SLIMBUS mode\n", __func__);
 		return -ENODEV;
 	}