Commit 34787d0a authored by Xiubo Li's avatar Xiubo Li Committed by Mark Brown

ASoC: simple-card: fix the cinfo error check

If the dt is used and the cinfo is NULL, the -ENOMEM should be return.
Signed-off-by: default avatarXiubo Li <Li.Xiubo@freescale.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 708ec024
......@@ -211,15 +211,17 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
dev_err(dev, "parse error %d\n", ret);
return ret;
}
} else {
return -ENOMEM;
}
} else {
cinfo = pdev->dev.platform_data;
cinfo->snd_card.dev = &pdev->dev;
}
if (!cinfo) {
dev_err(dev, "no info for asoc-simple-card\n");
return -EINVAL;
}
if (!cinfo) {
dev_err(dev, "no info for asoc-simple-card\n");
return -EINVAL;
cinfo->snd_card.dev = &pdev->dev;
}
if (!cinfo->name ||
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment