diff options
| author |   Alex Dewar <alex.dewar90@gmail.com> | 2020-10-04 11:25:36 +0100 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2020-10-06 15:24:40 +0100 |
| commit | cd7dea5e17a561e621e78e5863f5634cb6f9f097 (patch) | |
| tree | 6846eaacb552ab521bc69a1f0c516b3da5a95f38 /sound | |
| parent | ASoC: Intel: haswell: Mark FE DAIs as nonatomic (diff) | |
| download | linux-dev-cd7dea5e17a561e621e78e5863f5634cb6f9f097.tar.xz linux-dev-cd7dea5e17a561e621e78e5863f5634cb6f9f097.zip | |
ASoC: omap-mcbsp: Fix use of uninitialised pointer
Commit 9c34d023dc35 ("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: 9c34d023dc35 ("ASoC: omap-mcbsp: Re-arrange files for core McBSP and Sidetone function split")
Signed-off-by: Alex Dewar <alex.dewar90@gmail.com>
Link: https://lore.kernel.org/r/20201004102535.325547-1-alex.dewar90@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/ti/omap-mcbsp.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c index 186cea91076f..6025b30bbe77 100644 --- a/sound/soc/ti/omap-mcbsp.c +++ b/sound/soc/ti/omap-mcbsp.c @@ -620,7 +620,11 @@ static int omap_mcbsp_init(struct platform_device *pdev) spin_lock_init(&mcbsp->lock); 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)) return PTR_ERR(mcbsp->io_base); |