summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/dc/nvhdcp.c
diff options
context:
space:
mode:
authorAndrei Warkentin <andreiw@motorola.com>2011-04-21 11:57:57 -0500
committerDan Willemsen <dwillemsen@nvidia.com>2013-09-14 01:17:58 -0700
commit1b9a3dbe23577c2f16cad3eaedc4201bdb2f9459 (patch)
tree7efe6ee5b52b191a5af634ccfeed084b3f142448 /drivers/video/tegra/dc/nvhdcp.c
parent5e547ab15b03dd76ab802da7c59451d39478789f (diff)
video: tegra: dc: Fix several problems
Resolve potential race between resume and reset Fix wmb after return Change-Id: I98ad1e713b9781d780bf93561496011bf62b86d1 Signed-off-by: Andrei Warkentin <andreiw@motorola.com> Rebase-Id: R248821307a1d2ac9454e50f9fa5bc3ccadc4e092
Diffstat (limited to 'drivers/video/tegra/dc/nvhdcp.c')
-rw-r--r--drivers/video/tegra/dc/nvhdcp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/tegra/dc/nvhdcp.c b/drivers/video/tegra/dc/nvhdcp.c
index ca57f8d582bd..1913f82d90ff 100644
--- a/drivers/video/tegra/dc/nvhdcp.c
+++ b/drivers/video/tegra/dc/nvhdcp.c
@@ -109,8 +109,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,