aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Jaillet <christophe.jaillet@wanadoo.fr>2017-08-27 02:46:50 -0400
committerMark Brown <broonie@kernel.org>2017-08-27 08:30:29 -0400
commit4243e0457c9b1fe5e96fba19296469466eb24b1d (patch)
treee2a26df104b95fe6c3184084c294cafda4e69322
parentdc09233908cf47339f5000dc54574685e917af77 (diff)
ASoC: davinci-mcasp: check memory allocation failure
Check memory allocation failures and return -ENOMEM in such cases, as already done above for another memory allocation. This avoids NULL pointers dereference. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/davinci/davinci-mcasp.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index d486908d4e0e..f395bbc7c354 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -1851,6 +1851,10 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
1851 mcasp->context.xrsr_regs = devm_kzalloc(&pdev->dev, 1851 mcasp->context.xrsr_regs = devm_kzalloc(&pdev->dev,
1852 sizeof(u32) * mcasp->num_serializer, 1852 sizeof(u32) * mcasp->num_serializer,
1853 GFP_KERNEL); 1853 GFP_KERNEL);
1854 if (!mcasp->context.xrsr_regs) {
1855 ret = -ENOMEM;
1856 goto err;
1857 }
1854#endif 1858#endif
1855 mcasp->serial_dir = pdata->serial_dir; 1859 mcasp->serial_dir = pdata->serial_dir;
1856 mcasp->version = pdata->version; 1860 mcasp->version = pdata->version;