iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: simple-card: fix the cinfo error check

Browse Source 
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:
Xiubo Li
2014-01-09 17:49:40 +08:00
committed by Mark Brown
parent 708ec0241c
commit 34787d0a25
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/generic/simple-card.c
View File

@ -211,17 +211,19 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
dev_err(dev, "parse error %d\n", ret); dev_err(dev, "parse error %d\n", ret);
return ret; return ret;
} }
} else {
return -ENOMEM;
} }
} else { } else {
cinfo = pdev->dev.platform_data; cinfo = pdev->dev.platform_data;
cinfo->snd_card.dev = &pdev->dev;
}
if (!cinfo) { if (!cinfo) {
dev_err(dev, "no info for asoc-simple-card\n"); dev_err(dev, "no info for asoc-simple-card\n");
return -EINVAL; return -EINVAL;
} }
cinfo->snd_card.dev = &pdev->dev;
}
if (!cinfo->name || if (!cinfo->name ||
!cinfo->card || !cinfo->card ||
!cinfo->codec_dai.name || !cinfo->codec_dai.name ||