diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/tegra/tegra20_ac97.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c index d8c142dc93e4..9043626da6fa 100644 --- a/sound/soc/tegra/tegra20_ac97.c +++ b/sound/soc/tegra/tegra20_ac97.c | |||
@@ -341,18 +341,10 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev) | |||
341 | goto err_clk_put; | 341 | goto err_clk_put; |
342 | } | 342 | } |
343 | 343 | ||
344 | memregion = devm_request_mem_region(&pdev->dev, mem->start, | 344 | regs = devm_ioremap_resource(&pdev->dev, mem); |
345 | resource_size(mem), DRV_NAME); | 345 | if (IS_ERR(regs)) { |
346 | if (!memregion) { | 346 | ret = PTR_ERR(regs); |
347 | dev_err(&pdev->dev, "Memory region already claimed\n"); | 347 | dev_err(&pdev->dev, "ioremap failed: %d\n", ret); |
348 | ret = -EBUSY; | ||
349 | goto err_clk_put; | ||
350 | } | ||
351 | |||
352 | regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem)); | ||
353 | if (!regs) { | ||
354 | dev_err(&pdev->dev, "ioremap failed\n"); | ||
355 | ret = -ENOMEM; | ||
356 | goto err_clk_put; | 348 | goto err_clk_put; |
357 | } | 349 | } |
358 | 350 | ||