diff options
| author | Jubeom Kim <jubeomk@nvidia.com> | 2012-09-21 18:54:50 -0700 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-10-25 12:18:32 -0700 |
| commit | c8161214abcf38f57dffe1695efec9d8d199fab6 (patch) | |
| tree | 485fee6995b9a9f48fc0765e7ee79b7159de7f10 /sound | |
| parent | fad1251b1c3327aa8fe51ef6790ebe1d5fd2a2ed (diff) | |
asoc: tegra: fix rt5640 gpio.
This is no audio issue and need it for E1611.
Signed-off-by: Jubeom Kim <jubeomk@nvidia.com>
Reviewed-on: http://git-master/r/134559
(cherry picked from commit f26f2949e5ff1b0c6016b6b3350cc3d9f9099c30)
Change-Id: I6d77dc094c3e9df10e718eea86df662dd47337f2
Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-on: http://git-master/r/146955
Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/tegra/tegra_rt5640.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c index ef394773c199..79e4141efceb 100644 --- a/sound/soc/tegra/tegra_rt5640.c +++ b/sound/soc/tegra/tegra_rt5640.c @@ -545,24 +545,24 @@ static int tegra_rt5640_init(struct snd_soc_pcm_runtime *rtd) ret = gpio_request(pdata->gpio_int_mic_en, "int_mic_en"); if (ret) { dev_err(card->dev, "cannot get int_mic_en gpio\n"); - return ret; - } - machine->gpio_requested |= GPIO_INT_MIC_EN; + } else { + machine->gpio_requested |= GPIO_INT_MIC_EN; - /* Disable int mic; enable signal is active-high */ - gpio_direction_output(pdata->gpio_int_mic_en, 0); + /* Disable int mic; enable signal is active-high */ + gpio_direction_output(pdata->gpio_int_mic_en, 0); + } } if (gpio_is_valid(pdata->gpio_ext_mic_en)) { ret = gpio_request(pdata->gpio_ext_mic_en, "ext_mic_en"); if (ret) { dev_err(card->dev, "cannot get ext_mic_en gpio\n"); - return ret; - } - machine->gpio_requested |= GPIO_EXT_MIC_EN; + } 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); + /* Disable ext mic; enable signal is active-low */ + gpio_direction_output(pdata->gpio_ext_mic_en, 1); + } } if (gpio_is_valid(pdata->gpio_hp_det)) { |