From: Erik Gilling <konkers@android.com>
Date: Fri, 25 Feb 2011 01:13:10 +0000 (-0800)
Subject: Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
X-Git-Tag: firefly_0821_release~9833^2~32
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=56edb8f957edbfe32739a5c709bf8f587be52724;p=firefly-linux-kernel-4.4.55.git

Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36

Conflicts:
	drivers/video/tegra/dc/hdmi.c

Change-Id: I10fd2dbcc07d7961dd75e10a2c4de926457c2912
---

56edb8f957edbfe32739a5c709bf8f587be52724
diff --cc drivers/video/tegra/dc/hdmi.c
index 3e274ecb73de,8b8afe22254d..92a12ee448c4
--- a/drivers/video/tegra/dc/hdmi.c
+++ b/drivers/video/tegra/dc/hdmi.c
@@@ -467,7 -467,7 +471,8 @@@ static bool tegra_dc_hdmi_detect(struc
  	return true;
  
  fail:
 +	switch_set_state(&hdmi->hpd_switch, 0);
+ 	tegra_nvhdcp_set_plug(hdmi->nvhdcp, 0);
  	return false;
  }