diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-04-25 14:42:58 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-04-25 14:42:58 +0530 |
| commit | ed22062df7ae836e674c01f69e8567ad51ba31b1 (patch) | |
| tree | 32972feea81e770d650a3dc7d36907a7c49f9d4d /drivers/video | |
| parent | 90651aad036485974b99101df66a50e57c19e732 (diff) | |
| parent | 2e35e1d7b965893e68f2fb1af77129406be5ff05 (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts:
arch/arm/mm/proc-v7.S
drivers/video/tegra/dc/dc.c
Change-Id: I40be0d615f14f1c01305388a706d257f624ba968
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/tegra/dc/dc.c | 2 | ||||
| -rw-r--r-- | drivers/video/tegra/dc/nvhdcp.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c index fc87efb681a3..15bda8329d28 100644 --- a/drivers/video/tegra/dc/dc.c +++ b/drivers/video/tegra/dc/dc.c @@ -1192,7 +1192,7 @@ static bool _tegra_dc_controller_enable(struct tegra_dc *dc) dc->out->enable(); tegra_dc_setup_clk(dc, dc->clk); - + tegra_periph_reset_assert(dc->clk); clk_enable(dc->clk); clk_enable(dc->emc_clk); tegra_periph_reset_deassert(dc->clk); diff --git a/drivers/video/tegra/dc/nvhdcp.c b/drivers/video/tegra/dc/nvhdcp.c index f3a689559dda..69b8161119de 100644 --- a/drivers/video/tegra/dc/nvhdcp.c +++ b/drivers/video/tegra/dc/nvhdcp.c @@ -108,8 +108,9 @@ static inline bool nvhdcp_is_plugged(struct tegra_nvhdcp *nvhdcp) static inline bool nvhdcp_set_plugged(struct tegra_nvhdcp *nvhdcp, bool plugged) { - return nvhdcp->plugged = plugged; + nvhdcp->plugged = plugged; wmb(); + return plugged; } static int nvhdcp_i2c_read(struct tegra_nvhdcp *nvhdcp, u8 reg, |