From: Seungwhan Youn <sw.youn@samsung.com>
Date: Mon, 4 Apr 2011 04:43:42 +0000 (+0900)
Subject: ASoC: Fix to avoid compile error
X-Git-Tag: MMI-PSA29.97-13-9~16612^2~1224^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=898f8b0b65715843f7afd86f3867270dc9ed8b74;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ASoC: Fix to avoid compile error

This patch fixes to avoid compile error when ASoC codec doesn't use I2C
nor SPI on snd_soc_hw_bulk_write_raw().

Signed-off-by: Seungwhan Youn <sw.youn@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c
index 22b099076223..8418b1fa1976 100644
--- a/sound/soc/soc-cache.c
+++ b/sound/soc/soc-cache.c
@@ -414,12 +414,16 @@ static int snd_soc_hw_bulk_write_raw(struct snd_soc_codec *codec, unsigned int r
 		return -EINVAL;
 
 	switch (codec->control_type) {
+#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE))
 	case SND_SOC_I2C:
 		ret = i2c_master_send(codec->control_data, data, len);
 		break;
+#endif
+#if defined(CONFIG_SPI_MASTER)
 	case SND_SOC_SPI:
 		ret = do_spi_write(codec->control_data, data, len);
 		break;
+#endif
 	default:
 		BUG();
 	}