aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/omap-dmic.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/omap/omap-dmic.c')
-rw-r--r--sound/soc/omap/omap-dmic.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c
index ba49ccd9eed9..8ebaf117d81f 100644
--- a/sound/soc/omap/omap-dmic.c
+++ b/sound/soc/omap/omap-dmic.c
@@ -493,19 +493,9 @@ static int asoc_dmic_probe(struct platform_device *pdev)
493 goto err_put_clk; 493 goto err_put_clk;
494 } 494 }
495 495
496 if (!devm_request_mem_region(&pdev->dev, res->start, 496 dmic->io_base = devm_ioremap_resource(&pdev->dev, res);
497 resource_size(res), pdev->name)) { 497 if (IS_ERR(dmic->io_base))
498 dev_err(dmic->dev, "memory region already claimed\n"); 498 return PTR_ERR(dmic->io_base);
499 ret = -ENODEV;
500 goto err_put_clk;
501 }
502
503 dmic->io_base = devm_ioremap(&pdev->dev, res->start,
504 resource_size(res));
505 if (!dmic->io_base) {
506 ret = -ENOMEM;
507 goto err_put_clk;
508 }
509 499
510 ret = snd_soc_register_dai(&pdev->dev, &omap_dmic_dai); 500 ret = snd_soc_register_dai(&pdev->dev, &omap_dmic_dai);
511 if (ret) 501 if (ret)