diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-08-02 18:11:25 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-08-02 18:11:25 +0200 |
| commit | ac190c76680cde6ce379b6be5baf89a970ea13d4 (patch) | |
| tree | 8708121cda4180ac9e5c89f5473a8d6f10fda711 /sound/soc/soc-core.c | |
| parent | 707fba3fa76a4c8855552f5d4c1a12430c09bce8 (diff) | |
| parent | 98d3088e534a2a61f6690b5426909b0c3b57a785 (diff) | |
Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Additional updates for 3.6
A few updates for issues discovered during the merge window, the main
one being the fix for the issues with defaulting to use of regmap
without properly checking if there was I/O in place already.
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index f219b2f7ee6..f81c5976b96 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1096,7 +1096,7 @@ static int soc_probe_codec(struct snd_soc_card *card, } /* If the driver didn't set I/O up try regmap */ - if (!codec->control_data) + if (!codec->write && dev_get_regmap(codec->dev, NULL)) snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP); if (driver->controls) |