diff options
| author | Erik Gilling <konkers@android.com> | 2010-12-01 13:45:02 -0800 |
|---|---|---|
| committer | Erik Gilling <konkers@android.com> | 2010-12-01 13:45:38 -0800 |
| commit | 4ed4afb836315bbfc12f1fec212c771f0835c93a (patch) | |
| tree | 78385eef0daf0a9ff06bcacfc29d4e766fafb8e5 /arch/arm/mach-tegra/tegra_i2s_audio.c | |
| parent | b03eb90cc3e3e1f6334939d9f0031bf54b3c9986 (diff) | |
| parent | 7682da908fc36d2c0edc63d269feafaa975ac82e (diff) | |
Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
Change-Id: I27504990282eccc4dd6edd16768ae32ad3e4380c
Diffstat (limited to 'arch/arm/mach-tegra/tegra_i2s_audio.c')
| -rw-r--r-- | arch/arm/mach-tegra/tegra_i2s_audio.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/mach-tegra/tegra_i2s_audio.c b/arch/arm/mach-tegra/tegra_i2s_audio.c index 39c6c0290f25..f3ec7b6fb5f1 100644 --- a/arch/arm/mach-tegra/tegra_i2s_audio.c +++ b/arch/arm/mach-tegra/tegra_i2s_audio.c @@ -1704,7 +1704,7 @@ static int tegra_audio_probe(struct platform_device *pdev) { int rc, i; struct resource *res; - struct clk *i2s_clk, *audio_sync_clk, *dap_mclk; + struct clk *i2s_clk, *dap_mclk; struct audio_driver_state *state; pr_info("%s\n", __func__); @@ -1780,14 +1780,6 @@ static int tegra_audio_probe(struct platform_device *pdev) } clk_enable(dap_mclk); - audio_sync_clk = tegra_get_clock_by_name(state->pdata->audio_sync_clk); - if (!audio_sync_clk) { - dev_err(&pdev->dev, "%s: could not get audio_2x clock\n", - __func__); - return -EIO; - } - clk_enable(audio_sync_clk); - rc = i2s_configure(pdev); if (rc < 0) return rc; |