aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2016-07-07 04:14:04 -0400
committerMark Brown <broonie@kernel.org>2016-07-07 05:40:58 -0400
commitb02c5cc7239b8f58ba5da24092288dd7a9a56acc (patch)
tree89dda426094addc91a2a44078f7c17929c3b83de
parent4bdc8d452c18a5b4f439a1bffdda6789c4a6c606 (diff)
ASoC: mediatek: mt2701: fix some error handling in probe
The check for if the "afe" allocation failed was too late and there wasn't a check for "afe->platform_priv". Fixes: 43a6a7e71063 ('ASoC: mediatek: add mt2701 platform driver implementation.') Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Garlic Tseng <garlic.tseng@mediatek.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/mediatek/mt2701/mt2701-afe-pcm.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
index 6c14d686bfa1..15522c08a967 100644
--- a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
+++ b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
@@ -1489,11 +1489,13 @@ static int mt2701_afe_pcm_dev_probe(struct platform_device *pdev)
1489 1489
1490 ret = 0; 1490 ret = 0;
1491 afe = devm_kzalloc(&pdev->dev, sizeof(*afe), GFP_KERNEL); 1491 afe = devm_kzalloc(&pdev->dev, sizeof(*afe), GFP_KERNEL);
1492 if (!afe)
1493 return -ENOMEM;
1492 afe->platform_priv = devm_kzalloc(&pdev->dev, sizeof(*afe_priv), 1494 afe->platform_priv = devm_kzalloc(&pdev->dev, sizeof(*afe_priv),
1493 GFP_KERNEL); 1495 GFP_KERNEL);
1494 afe_priv = afe->platform_priv; 1496 if (!afe->platform_priv)
1495 if (!afe)
1496 return -ENOMEM; 1497 return -ENOMEM;
1498 afe_priv = afe->platform_priv;
1497 1499
1498 afe->dev = &pdev->dev; 1500 afe->dev = &pdev->dev;
1499 dev = afe->dev; 1501 dev = afe->dev;