Commit cd7dea5e authored by Alex Dewar's avatar Alex Dewar Committed by Mark Brown

ASoC: omap-mcbsp: Fix use of uninitialised pointer

Commit 9c34d023 ("ASoC: omap-mcbsp: Re-arrange files for core McBSP
and Sidetone function split"), in rearranging various files, also replaced
calls to platform_get_resource_by_name() + devm_ioremap_resource() with a
single call to devm_platform_ioremap_resource_byname(). However, the
struct resource is needed as we access its members so at present a null
pointer is dereferenced. Fix by doing things the old way.

Fixes: 9c34d023 ("ASoC: omap-mcbsp: Re-arrange files for core McBSP and Sidetone function split")
Signed-off-by: default avatarAlex Dewar <alex.dewar90@gmail.com>
Link: https://lore.kernel.org/r/20201004102535.325547-1-alex.dewar90@gmail.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent dc155ad5
...@@ -620,7 +620,11 @@ static int omap_mcbsp_init(struct platform_device *pdev) ...@@ -620,7 +620,11 @@ static int omap_mcbsp_init(struct platform_device *pdev)
spin_lock_init(&mcbsp->lock); spin_lock_init(&mcbsp->lock);
mcbsp->free = true; mcbsp->free = true;
mcbsp->io_base = devm_platform_ioremap_resource_byname(pdev, "mpu"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");
if (!res)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
mcbsp->io_base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(mcbsp->io_base)) if (IS_ERR(mcbsp->io_base))
return PTR_ERR(mcbsp->io_base); return PTR_ERR(mcbsp->io_base);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment