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: Xiubo Li <Li.Xiubo@freescale.com> Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Родитель
708ec0241c
Коммит
34787d0a25
|
@ -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 ||
|
||||
|
|
Загрузка…
Ссылка в новой задаче