diff options
| author | Takashi Iwai | 2013-07-01 11:23:13 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2013-07-01 11:23:13 +0200 |
| commit | ef866ac0c29223d01ce751bb342d8f4fa1b2580a (patch) | |
| tree | f6e006b369f08f379fa0c164ff34783daf02215a /sound/soc/tegra | |
| parent | Merge branch 'for-next' into for-linus (diff) | |
| parent | Merge remote-tracking branch 'asoc/topic/x86' into asoc-next (diff) | |
| download | kernel-qcow2-linux-ef866ac0c29223d01ce751bb342d8f4fa1b2580a.tar.gz kernel-qcow2-linux-ef866ac0c29223d01ce751bb342d8f4fa1b2580a.tar.xz kernel-qcow2-linux-ef866ac0c29223d01ce751bb342d8f4fa1b2580a.zip | |
Merge tag 'asoc-v3.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Final updates for v3.11
A few final updates:
- A couple of additional bug fixes for the AC'97 refactoring.
- Some fixes for the ADAU1701 driver.
Diffstat (limited to 'sound/soc/tegra')
| -rw-r--r-- | sound/soc/tegra/tegra20_ac97.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/tegra/tegra20_ac97.c b/sound/soc/tegra/tegra20_ac97.c index f52eab6d2231..e58233f7df61 100644 --- a/sound/soc/tegra/tegra20_ac97.c +++ b/sound/soc/tegra/tegra20_ac97.c @@ -312,7 +312,7 @@ static const struct regmap_config tegra20_ac97_regmap_config = { static int tegra20_ac97_platform_probe(struct platform_device *pdev) { struct tegra20_ac97 *ac97; - struct resource *mem, *memregion; + struct resource *mem; u32 of_dma[2]; void __iomem *regs; int ret = 0; @@ -343,7 +343,6 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev) regs = devm_ioremap_resource(&pdev->dev, mem); if (IS_ERR(regs)) { ret = PTR_ERR(regs); - dev_err(&pdev->dev, "ioremap failed: %d\n", ret); goto err_clk_put; } |