| From 9febd494d15c4a351e9c9cae7184643144eea892 Mon Sep 17 00:00:00 2001 |
| From: Alexander Shiyan <shc_work@mail.ru> |
| Date: Sat, 15 Feb 2014 23:28:29 +0400 |
| Subject: ASoC: txx9aclc_ac97: Fix kernel crash on probe |
| |
| From: Alexander Shiyan <shc_work@mail.ru> |
| |
| commit 9febd494d15c4a351e9c9cae7184643144eea892 upstream. |
| |
| This patch fixes a crash caused by commit 3bed3344c826 |
| (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: 3bed3344c826 (ASoC: txx9aclc_ac97: Convert to devm_ioremap_resource()) |
| Signed-off-by: Alexander Shiyan <shc_work@mail.ru> |
| Signed-off-by: Mark Brown <broonie@linaro.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| sound/soc/txx9/txx9aclc-ac97.c | 8 +++++--- |
| 1 file changed, 5 insertions(+), 3 deletions(-) |
| |
| --- a/sound/soc/txx9/txx9aclc-ac97.c |
| +++ b/sound/soc/txx9/txx9aclc-ac97.c |
| @@ -183,14 +183,16 @@ static int txx9aclc_ac97_dev_probe(struc |
| 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) && |
