diff options
author | Mark Brown <broonie@kernel.org> | 2018-10-21 16:59:23 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-10-21 16:59:23 +0100 |
commit | 65dfb6d6dd2850f3f99f08536d2b14190350c854 (patch) | |
tree | e8b0468b3e4d4d54dbea68c9ffce9fd8648be2aa /sound/soc/codecs/tscs454.c | |
parent | 576b354ac25b544a31f27c365410d59fcbfee064 (diff) | |
parent | 7f91e2af1a4a2c34fc2e8fb046c722e1a9c85399 (diff) |
Merge branch 'asoc-4.20' into asoc-next
Diffstat (limited to 'sound/soc/codecs/tscs454.c')
-rw-r--r-- | sound/soc/codecs/tscs454.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/tscs454.c b/sound/soc/codecs/tscs454.c index ff85a0bf6170..93d84e5ae2d5 100644 --- a/sound/soc/codecs/tscs454.c +++ b/sound/soc/codecs/tscs454.c @@ -3459,7 +3459,7 @@ static int tscs454_i2c_probe(struct i2c_client *i2c, /* Sync pg sel reg with cache */ regmap_write(tscs454->regmap, R_PAGESEL, 0x00); - ret = snd_soc_register_component(&i2c->dev, &soc_component_dev_tscs454, + ret = devm_snd_soc_register_component(&i2c->dev, &soc_component_dev_tscs454, tscs454_dais, ARRAY_SIZE(tscs454_dais)); if (ret) { dev_err(&i2c->dev, "Failed to register component (%d)\n", ret); |