Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0dcd4742 authored by Lee Jones's avatar Lee Jones Committed by Mark Brown
Browse files

ASoC: ux500: Strengthen error checking after memory allocation 



Currently there is no out-of-memory error checking after attempting
to allocate memory for the ux500_msp or ux500_msp_i2s_drvdata data
structures. Instead we go about populating them regardless. This
patch applies the necessary error checking to prevent a panic.

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent fbfe6983

sound/soc/ux500/ux500_msp_dai.c

+3 −0
Original line number Diff line number Diff line
@@ -760,6 +760,9 @@ static int __devinit ux500_msp_drv_probe(struct platform_device *pdev) 
	drvdata = devm_kzalloc(&pdev->dev,

				sizeof(struct ux500_msp_i2s_drvdata),

				GFP_KERNEL);

	if (!drvdata)

		return -ENOMEM;



	drvdata->fmt = 0;

	drvdata->slots = 1;

	drvdata->tx_mask = 0x01;

sound/soc/ux500/ux500_msp_i2s.c

+2 −0
Original line number Diff line number Diff line
@@ -673,6 +673,8 @@ int ux500_msp_i2s_init_msp(struct platform_device *pdev, 


	*msp_p = devm_kzalloc(&pdev->dev, sizeof(struct ux500_msp), GFP_KERNEL);

	msp = *msp_p;

	if (!msp)

		return -ENOMEM;



	msp->id = platform_data->id;

	msp->dev = &pdev->dev;