Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3a3d3c4 authored by Christophe Jaillet's avatar Christophe Jaillet Committed by Mark Brown
Browse files

ASoC: rockchip: Fix an error handling in 'rockchip_i2s_probe' 



If this memory allocation fail, we must disable what has been enabled.
Do not return immediately but go thrue the error handling path instead.

Also use 'devm_kmemdup' instead of 'devm_kzalloc+memcpy' to simplify code.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ec2212c4

sound/soc/rockchip/rockchip_i2s.c

+5 −4
Original line number Diff line number Diff line
@@ -641,12 +641,13 @@ static int rockchip_i2s_probe(struct platform_device *pdev) 
			goto err_pm_disable;

	}



	soc_dai = devm_kzalloc(&pdev->dev,

	soc_dai = devm_kmemdup(&pdev->dev, &rockchip_i2s_dai

			       sizeof(*soc_dai), GFP_KERNEL);

	if (!soc_dai)

		return -ENOMEM;

	if (!soc_dai) {

		err = -ENOMEM;

		goto err_pm_disable;

	}



	memcpy(soc_dai, &rockchip_i2s_dai, sizeof(*soc_dai));

	if (!of_property_read_u32(node, "rockchip,playback-channels", &val)) {

		if (val >= 2 && val <= 8)

			soc_dai->playback.channels_max = val;