Commit 81bca762 authored Aug 11, 2011 by Stephen Warren Committed by Mark Brown Aug 12, 2011

ASoC: soc-io: Fix CONFIG_REGMAP_I2C/SPI guards to support regmap modules

When CONFIG_REGMAP_I2C/SPI are m, CONFIG_REGMAP_I2C_MODULE is set in the
pre-processor instead of CONFIG_REGMAP_I2C. This removes SND_SOC_I2C as a
valid option for snd_soc_codec_set_cache_io()'s control parameter, and
causes any ASoC regmap-using codec built as a module to fail to initialize.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

parent 68d5a59e

sound/soc/soc-io.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -122,14 +122,14 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
		config.val_bits = data_bits;

		switch (control) {
		#ifdef CONFIG_REGMAP_I2C
		#if defined(CONFIG_REGMAP_I2C) \|\| defined(CONFIG_REGMAP_I2C_MODULE)
		case SND_SOC_I2C:
		codec->control_data = regmap_init_i2c(to_i2c_client(codec->dev),
		&config);
		break;
		#endif

		#ifdef CONFIG_REGMAP_SPI
		#if defined(CONFIG_REGMAP_SPI) \|\| defined(CONFIG_REGMAP_SPI_MODULE)
		case SND_SOC_SPI:
		codec->control_data = regmap_init_spi(to_spi_device(codec->dev),
		&config);

Admin message