diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-09-01 18:47:04 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-09-04 10:34:30 +0200 |
| commit | b7c9d8520564eca89da8733e5248c7ce8ee8e1b0 (patch) | |
| tree | 2788d304f3e00e91cbaec157291270105af7e52a /sound/soc/codecs/ak4535.c | |
| parent | d2a403553ba7659d85dae2a05b1f3767d2fefcfe (diff) | |
ALSA: ASoC: Don't suggest compile time selection of codec access
Currently the boiler plate code used by most ASoC codecs to provide a
placeholder for SPI access suggests making the selection of SPI a
compile time option which is suboptimal when trying to build kernels
supporting multiple systems. Change this template to suggest allowing
runtime selection instead.
Leave the drivers not yet converted to new style I2C access for now to
avoid collisions.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/soc/codecs/ak4535.c')
| -rw-r--r-- | sound/soc/codecs/ak4535.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c index e512cd79d76..088cf992772 100644 --- a/sound/soc/codecs/ak4535.c +++ b/sound/soc/codecs/ak4535.c @@ -622,7 +622,7 @@ static int ak4535_probe(struct platform_device *pdev) struct ak4535_setup_data *setup; struct snd_soc_codec *codec; struct ak4535_priv *ak4535; - int ret = 0; + int ret; printk(KERN_INFO "AK4535 Audio Codec %s", AK4535_VERSION); @@ -644,14 +644,14 @@ static int ak4535_probe(struct platform_device *pdev) INIT_LIST_HEAD(&codec->dapm_paths); ak4535_socdev = socdev; + ret = -ENODEV; + #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) if (setup->i2c_address) { codec->hw_write = (hw_write_t)i2c_master_send; codec->hw_read = (hw_read_t)i2c_master_recv; ret = ak4535_add_i2c_device(pdev, setup); } -#else - /* Add other interfaces here */ #endif if (ret != 0) { |