diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-22 14:28:52 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-22 14:28:52 +0100 |
| commit | 840f0e43782ed132da0db00982a41b003ff6a179 (patch) | |
| tree | aeea5e732afbf453a0777edcd4ee82a0eda7fd76 /sound/soc/tegra/tegra20_ac97.c | |
| parent | 049d41409d7089a7a128950231642055b963f0e4 (diff) | |
| parent | b4345006423d45622bc17198a598baefcea27c93 (diff) | |
Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next
Diffstat (limited to 'sound/soc/tegra/tegra20_ac97.c')
| -rw-r--r-- | sound/soc/tegra/tegra20_ac97.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c index 6c486625321b..ae27bcd586d2 100644 --- a/sound/soc/tegra/tegra20_ac97.c +++ b/sound/soc/tegra/tegra20_ac97.c @@ -334,12 +334,6 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev) } mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!mem) { - dev_err(&pdev->dev, "No memory resource\n"); - ret = -ENODEV; - goto err_clk_put; - } - regs = devm_ioremap_resource(&pdev->dev, mem); if (IS_ERR(regs)) { ret = PTR_ERR(regs); @@ -432,8 +426,6 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev) return 0; -err_unregister_pcm: - tegra_pcm_platform_unregister(&pdev->dev); err_unregister_component: snd_soc_unregister_component(&pdev->dev); err_asoc_utils_fini: |