diff options
| author | Mark Brown <broonie@kernel.org> | 2020-10-09 17:42:31 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-10-09 17:42:31 +0300 |
| commit | c890e30b069a2792a5a34e8510a7a437dd6f5b3d (patch) | |
| tree | f7fc7cb5e6fddbe4cae599b41bb39ebc349b94cd /sound/soc/fsl/imx-audmix.c | |
| parent | 7ffe09eebf732f9c95623613fb706dada858c07d (diff) | |
| parent | 86f29c7442ac4ba5fe19fc2ada457f76c0080dd6 (diff) | |
| download | linux-c890e30b069a2792a5a34e8510a7a437dd6f5b3d.tar.xz | |
Merge remote-tracking branch 'asoc/for-5.10' into asoc-next
Diffstat (limited to 'sound/soc/fsl/imx-audmix.c')
| -rw-r--r-- | sound/soc/fsl/imx-audmix.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/fsl/imx-audmix.c b/sound/soc/fsl/imx-audmix.c index 202fb8950078..cbdc0a2c09c5 100644 --- a/sound/soc/fsl/imx-audmix.c +++ b/sound/soc/fsl/imx-audmix.c @@ -185,20 +185,20 @@ static int imx_audmix_probe(struct platform_device *pdev) return -ENOMEM; priv->num_dai = 2 * num_dai; - priv->dai = devm_kzalloc(&pdev->dev, priv->num_dai * + priv->dai = devm_kcalloc(&pdev->dev, priv->num_dai, sizeof(struct snd_soc_dai_link), GFP_KERNEL); if (!priv->dai) return -ENOMEM; priv->num_dai_conf = num_dai; - priv->dai_conf = devm_kzalloc(&pdev->dev, priv->num_dai_conf * + priv->dai_conf = devm_kcalloc(&pdev->dev, priv->num_dai_conf, sizeof(struct snd_soc_codec_conf), GFP_KERNEL); if (!priv->dai_conf) return -ENOMEM; priv->num_dapm_routes = 3 * num_dai; - priv->dapm_routes = devm_kzalloc(&pdev->dev, priv->num_dapm_routes * + priv->dapm_routes = devm_kcalloc(&pdev->dev, priv->num_dapm_routes, sizeof(struct snd_soc_dapm_route), GFP_KERNEL); if (!priv->dapm_routes) @@ -208,7 +208,7 @@ static int imx_audmix_probe(struct platform_device *pdev) struct snd_soc_dai_link_component *dlc; /* for CPU/Codec/Platform x 2 */ - dlc = devm_kzalloc(&pdev->dev, 6 * sizeof(*dlc), GFP_KERNEL); + dlc = devm_kcalloc(&pdev->dev, 6, sizeof(*dlc), GFP_KERNEL); if (!dlc) { dev_err(&pdev->dev, "failed to allocate dai_link\n"); return -ENOMEM; |