Permalink
Browse files

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>
  • Loading branch information...
1 parent 77a9f2d commit 734caf378bd667c73861f76c212dd8b74f729bb0 Erik Gilling committed Apr 13, 2011
Showing with 3 additions and 3 deletions.
  1. +3 −3 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);

0 comments on commit 734caf3

Please sign in to comment.