diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2022-05-03 11:53:42 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2022-05-03 11:53:42 +0200 |
| commit | b812f646bb818ca0e1806072eb7f0006f3a65dde (patch) | |
| tree | 3ba2134dcefd8127f5ad286e0fe1135588fbd0b3 /sound/soc/codecs/rk817_codec.c | |
| parent | a5fc012e6ee75a899173398573e77207542f588a (diff) | |
| parent | e954d2c94d007afe487044ecfa48f2518643df0e (diff) | |
Merge drm/drm-next into drm-misc-next
Christian needs a backmerge to avoid a merge conflict for amdgpu.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'sound/soc/codecs/rk817_codec.c')
| -rw-r--r-- | sound/soc/codecs/rk817_codec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/rk817_codec.c b/sound/soc/codecs/rk817_codec.c index 8fffe378618d..cce6f4e7992f 100644 --- a/sound/soc/codecs/rk817_codec.c +++ b/sound/soc/codecs/rk817_codec.c @@ -489,7 +489,7 @@ static int rk817_platform_probe(struct platform_device *pdev) rk817_codec_parse_dt_property(&pdev->dev, rk817_codec_data); - rk817_codec_data->mclk = clk_get(pdev->dev.parent, "mclk"); + rk817_codec_data->mclk = devm_clk_get(pdev->dev.parent, "mclk"); if (IS_ERR(rk817_codec_data->mclk)) { dev_dbg(&pdev->dev, "Unable to get mclk\n"); ret = -ENXIO; |