diff options
| author | Erik Gilling <konkers@android.com> | 2011-04-13 08:12:28 -0700 |
|---|---|---|
| committer | Erik Gilling <konkers@android.com> | 2011-04-13 08:13:02 -0700 |
| commit | 493edeba1c2b5af4f1aad84b6725de1aea7bab06 (patch) | |
| tree | dcd3658146a8487d9aa15dab68cfa380b73431cd /drivers/video | |
| parent | 0b8bff5ecc4b9077207db4f0adc4a3fdfb70fdb9 (diff) | |
| parent | 734caf378bd667c73861f76c212dd8b74f729bb0 (diff) | |
Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
Change-Id: I016b27ad8ada8ec6214b1ed2b6096c294d2e81b8
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/tegra/dc/nvhdcp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/tegra/dc/nvhdcp.c b/drivers/video/tegra/dc/nvhdcp.c index faa15c6081fc..f120b5349271 100644 --- a/drivers/video/tegra/dc/nvhdcp.c +++ b/drivers/video/tegra/dc/nvhdcp.c @@ -980,12 +980,12 @@ static void nvhdcp_downstream_worker(struct work_struct *work) nvhdcp_info("link verified!\n"); while (1) { - if (nvhdcp->state != STATE_LINK_VERIFY) - goto failure; - if (!nvhdcp_is_plugged(nvhdcp)) goto lost_hdmi; + if (nvhdcp->state != STATE_LINK_VERIFY) + goto failure; + e = verify_link(nvhdcp, true); if (e) { nvhdcp_err("link verification failed err %d\n", e); |