From: Erik Gilling <konkers@android.com>
Date: Wed, 13 Apr 2011 15:03:41 +0000 (-0700)
Subject: video: tegra: fix unplug/suspend timeout in nvhdcp
X-Git-Tag: firefly_0821_release~9834^2~13
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fee6da91b417f081e68a11c1736358e3ace83fd1;p=firefly-linux-kernel-4.4.55.git

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>
---

diff --git a/drivers/video/tegra/dc/nvhdcp.c b/drivers/video/tegra/dc/nvhdcp.c
index 1485e9236087..408bf2e99d0c 100644
--- a/drivers/video/tegra/dc/nvhdcp.c
+++ b/drivers/video/tegra/dc/nvhdcp.c
@@ -982,12 +982,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);