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

Commit 9febd494 authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Mark Brown
Browse files

ASoC: txx9aclc_ac97: Fix kernel crash on probe 



This patch fixes a crash caused by commit 3bed3344
(ASoC: txx9aclc_ac97: Convert to devm_ioremap_resource()).
This is an attempt to assign "drvdata->base" while memory
for "drvdata" is not already allocated.

Fixes: 3bed3344 (ASoC: txx9aclc_ac97: Convert to devm_ioremap_resource())
Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
Cc: stable@vger.kernel.org
parent 38dbfb59

sound/soc/txx9/txx9aclc-ac97.c

+5 −3
Original line number Diff line number Diff line
@@ -183,14 +183,16 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev) 
	irq = platform_get_irq(pdev, 0);

	if (irq < 0)

		return irq;



	drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL);

	if (!drvdata)

		return -ENOMEM;



	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	drvdata->base = devm_ioremap_resource(&pdev->dev, r);

	if (IS_ERR(drvdata->base))

		return PTR_ERR(drvdata->base);



	drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL);

	if (!drvdata)

		return -ENOMEM;

	platform_set_drvdata(pdev, drvdata);

	drvdata->physbase = r->start;

	if (sizeof(drvdata->physbase) > sizeof(r->start) &&