diff options
| author | Vijay Mali <vmali@nvidia.com> | 2012-09-20 14:39:07 -0700 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-10-10 22:27:16 -0700 |
| commit | f825786fae26070308606b31a60086a035d61211 (patch) | |
| tree | 811ca916ead831c8967711c85eee0d8ec3688c14 /sound | |
| parent | 4487c4fe0ddf0e6adeed08660c2fc0d0b41b891a (diff) | |
asoc: tegra: Fix for no audio issue
Reviewed-on: http://git-master/r/134171
(cherry picked from commit 31f7ac77f844976fe809a52828dfcf3e440cfb34)
Change-Id: I2a57ec87aae94deba4b4f9e4eddc54e14ecd8a7d
Signed-off-by: Vijay Mali <vmali@nvidia.com>
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/143129
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/tegra/tegra_cs42l73.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sound/soc/tegra/tegra_cs42l73.c b/sound/soc/tegra/tegra_cs42l73.c index e44855f9d5a5..78152aa6549c 100644 --- a/sound/soc/tegra/tegra_cs42l73.c +++ b/sound/soc/tegra/tegra_cs42l73.c @@ -178,7 +178,6 @@ static int tegra_cs42l73_event_headset_mic(struct snd_soc_dapm_widget *w, /* Unmask MIC2_SDET interrupt */ snd_soc_update_bits(codec, CS42L73_IM1, MIC2_SDET, 1); - printk(KERN_ERR"[VIJAY] %s +\n", __func__); return 0; } @@ -244,14 +243,13 @@ static int tegra_cs42l73_init(struct snd_soc_pcm_runtime *rtd) if (gpio_is_valid(pdata->gpio_ext_mic_en)) { ret = gpio_request(pdata->gpio_ext_mic_en, "ext_mic_en"); - if (ret) { + if (ret) dev_err(card->dev, "cannot get ext_mic_en gpio\n"); - return ret; + else { + machine->gpio_requested |= GPIO_EXT_MIC_EN; + /* Disable ext mic; enable signal is active-low */ + gpio_direction_output(pdata->gpio_ext_mic_en, 1); } - machine->gpio_requested |= GPIO_EXT_MIC_EN; - - /* Disable ext mic; enable signal is active-low */ - gpio_direction_output(pdata->gpio_ext_mic_en, 1); } machine->bias_level = SND_SOC_BIAS_STANDBY; @@ -430,7 +428,6 @@ static __devinit int tegra_cs42l73_driver_probe(struct platform_device *pdev) goto err_unregister_card; } -printk(KERN_ERR"%s Checkpoint ... (10)\n", __func__); return 0; err_unregister_card: |