diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-03-08 10:49:43 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-03-08 10:49:43 +0100 |
| commit | 56d94d70398f0fbb1863a03a145db1a86f009a71 (patch) | |
| tree | 9e52dc537f8f8359c70b66f5000192bb280b41b9 /sound/soc/codecs/wm9713.c | |
| parent | bb63f726f98bec032c7322a9c36eb4167307d856 (diff) | |
| parent | fc4f000bf8c0cbf38f44de6bd5e225574e572ed4 (diff) | |
Merge branch 'topic/hda' into for-next
Diffstat (limited to 'sound/soc/codecs/wm9713.c')
| -rw-r--r-- | sound/soc/codecs/wm9713.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 79e143625ac3..9849643ef809 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -1212,7 +1212,7 @@ static int wm9713_soc_probe(struct snd_soc_codec *codec) if (IS_ERR(wm9713->ac97)) return PTR_ERR(wm9713->ac97); - regmap = devm_regmap_init_ac97(wm9713->ac97, &wm9713_regmap_config); + regmap = regmap_init_ac97(wm9713->ac97, &wm9713_regmap_config); if (IS_ERR(regmap)) { snd_soc_free_ac97_codec(wm9713->ac97); return PTR_ERR(regmap); |