diff options
| author | Erik Gilling <konkers@android.com> | 2011-04-13 08:03:41 -0700 |
|---|---|---|
| committer | Erik Gilling <konkers@android.com> | 2011-04-13 08:07:36 -0700 |
| commit | 734caf378bd667c73861f76c212dd8b74f729bb0 (patch) | |
| tree | ce30076e5348347715b0c8aed4fee391edc2d5a9 /drivers | |
| parent | 77a9f2d7ce63dd428ab66a1992333596d9c582e5 (diff) | |
video: tegra: fix unplug/suspend timeout in nvhdcp
If HDCP was turned off (either by unplug or suspend) the work funciton
would wait the full timeout 5 * l.75s before exiting. This
causes suspend to timeout and crash.
Change-Id: I8eb185452ad09e34f4573874e9766c0e1cec15de
Signed-off-by: Erik Gilling <konkers@android.com>
Diffstat (limited to 'drivers')
| -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); |