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/wm8750.c | |
| parent | d2a403553ba7659d85dae2a05b1f3767d2fefcfe (diff) | |
| download | lwn-b7c9d8520564eca89da8733e5248c7ce8ee8e1b0.tar.gz lwn-b7c9d8520564eca89da8733e5248c7ce8ee8e1b0.zip | |
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/wm8750.c')
| -rw-r--r-- | sound/soc/codecs/wm8750.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index 34d846587759..9847aa064d6b 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c @@ -934,7 +934,7 @@ static int wm8750_probe(struct platform_device *pdev) struct wm8750_setup_data *setup = socdev->codec_data; struct snd_soc_codec *codec; struct wm8750_priv *wm8750; - int ret = 0; + int ret; pr_info("WM8750 Audio Codec %s", WM8750_VERSION); codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL); @@ -955,13 +955,13 @@ static int wm8750_probe(struct platform_device *pdev) wm8750_socdev = socdev; INIT_DELAYED_WORK(&codec->delayed_work, wm8750_work); + ret = -ENODEV; + #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) if (setup->i2c_address) { codec->hw_write = (hw_write_t)i2c_master_send; ret = wm8750_add_i2c_device(pdev, setup); } -#else - /* Add other interfaces here */ #endif if (ret != 0) { |