Skip to content

Commit

Permalink
ASoC: core: Fix check before defaulting to regmap
Browse files Browse the repository at this point in the history
Check if the chip has provided a write operation (which is mandatory for
I/O) rather than looking for control data as some of the MFDs use a global
for this. Also skip the attempt if there's no regmap available by device
in case things get confused by the attempt to default.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Tested-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
  • Loading branch information
Mark Brown committed Aug 2, 2012
1 parent 9d40e55 commit 98d3088
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 98d3088

Please sign in to comment.