summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/dc/hdmi.c
diff options
context:
space:
mode:
authorSumit Bhattacharya <sumitb@nvidia.com>2011-09-28 17:04:49 +0530
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:49:08 -0800
commit4afe64e1d6b429be478c9b528b68f6527f9776e6 (patch)
tree41b497180f03f65621bb0b70bea8e6982c1b4431 /drivers/video/tegra/dc/hdmi.c
parent0ddaa4829766aae4fb295d4a263bfb9c16aa83e8 (diff)
video: tegra: Always store audio freq and source
Audio frequency and source should be always stored in HDMI driver context whenever tegra_hdmi_setup_audio_freq_source() gets called. This is required to avoid overwriting of audio frequency and source with default values when HDMI driver mode change happens. Bug 872652 Change-Id: Iddbd7525b8994c2a94523f387439cc3e438c0d29 Signed-off-by: Sumit Bhattacharya <sumitb@nvidia.com> Reviewed-on: http://git-master/r/54958 Reviewed-by: Scott Peterson <speterson@nvidia.com> Reviewed-by: Stephen Warren <swarren@nvidia.com> Rebase-Id: Reeed80d1308cfb0dea62d84d53a404b223525b24
Diffstat (limited to 'drivers/video/tegra/dc/hdmi.c')
-rw-r--r--drivers/video/tegra/dc/hdmi.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/video/tegra/dc/hdmi.c b/drivers/video/tegra/dc/hdmi.c
index 67a7d673181b..708d989b473d 100644
--- a/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@ -1216,11 +1216,10 @@ int tegra_hdmi_setup_audio_freq_source(unsigned audio_freq, unsigned audio_sourc
/* If we can program HDMI, then proceed */
if (hdmi->clk_enabled)
tegra_dc_hdmi_setup_audio(hdmi->dc, audio_freq,audio_source);
- else {
- /* Store it for using it in enable */
- hdmi->audio_freq = audio_freq;
- hdmi->audio_source = audio_source;
- }
+
+ /* Store it for using it in enable */
+ hdmi->audio_freq = audio_freq;
+ hdmi->audio_source = audio_source;
}
else
return -EINVAL;