Merge remote-tracking branch 'asoc/topic/io' into asoc-next
This commit is contained in:
@@ -1352,14 +1352,6 @@ static int sgtl5000_probe(struct snd_soc_codec *codec)
|
||||
int ret;
|
||||
struct sgtl5000_priv *sgtl5000 = snd_soc_codec_get_drvdata(codec);
|
||||
|
||||
/* setup i2c data ops */
|
||||
codec->control_data = sgtl5000->regmap;
|
||||
ret = snd_soc_codec_set_cache_io(codec, 16, 16, SND_SOC_REGMAP);
|
||||
if (ret < 0) {
|
||||
dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = sgtl5000_enable_regulators(codec);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
Reference in New Issue
Block a user