diff options
author | 2019-09-15 10:31:44 +0100 | |
---|---|---|
committer | 2019-09-15 10:31:44 +0100 | |
commit | a54f8485727e6e85b5dfe1d9708b80d13fe8bf5f (patch) | |
tree | 9d38878259b080ffa01e1e398094906ee4e988fe /sound/soc/fsl/imx-audmix.c | |
parent | Merge branch 'asoc-5.3' into asoc-linus (diff) | |
parent | ASoC: sdm845: remove unneeded semicolon (diff) | |
download | linux-a54f8485727e6e85b5dfe1d9708b80d13fe8bf5f.tar.gz linux-a54f8485727e6e85b5dfe1d9708b80d13fe8bf5f.tar.bz2 linux-a54f8485727e6e85b5dfe1d9708b80d13fe8bf5f.zip |
Merge branch 'asoc-5.4' into asoc-next
Diffstat (limited to 'sound/soc/fsl/imx-audmix.c')
-rw-r--r-- | sound/soc/fsl/imx-audmix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/fsl/imx-audmix.c b/sound/soc/fsl/imx-audmix.c index 9e1cb18859ce..71590ca6394b 100644 --- a/sound/soc/fsl/imx-audmix.c +++ b/sound/soc/fsl/imx-audmix.c @@ -325,14 +325,14 @@ static int imx_audmix_probe(struct platform_device *pdev) priv->card.num_configs = priv->num_dai_conf; priv->card.dapm_routes = priv->dapm_routes; priv->card.num_dapm_routes = priv->num_dapm_routes; - priv->card.dev = pdev->dev.parent; + priv->card.dev = &pdev->dev; priv->card.owner = THIS_MODULE; priv->card.name = "imx-audmix"; platform_set_drvdata(pdev, &priv->card); snd_soc_card_set_drvdata(&priv->card, priv); - ret = devm_snd_soc_register_card(pdev->dev.parent, &priv->card); + ret = devm_snd_soc_register_card(&pdev->dev, &priv->card); if (ret) { dev_err(&pdev->dev, "snd_soc_register_card failed\n"); return ret; |