summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Gilling <konkers@android.com>2011-04-15 15:56:26 -0700
committerErik Gilling <konkers@android.com>2011-04-15 15:56:26 -0700
commitd99cea140dba998d7ee1a24a7d32ec1b78c02f3f (patch)
treea5d4dca596d2661cc3c3c530be30730bffa52f01
parent493edeba1c2b5af4f1aad84b6725de1aea7bab06 (diff)
parent9da0efab32e17025d50abc2913fa878358303b57 (diff)
Merge branch 'linux-tegra' into android-tegra
-rw-r--r--drivers/video/tegra/dc/nvhdcp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/tegra/dc/nvhdcp.c b/drivers/video/tegra/dc/nvhdcp.c
index f120b5349271..7c8869a563f5 100644
--- a/drivers/video/tegra/dc/nvhdcp.c
+++ b/drivers/video/tegra/dc/nvhdcp.c
@@ -1003,7 +1003,9 @@ failure:
nvhdcp_err("nvhdcp failure - too many failures, giving up!\n");
} else {
nvhdcp_err("nvhdcp failure - renegotiating in 1.75 seconds\n");
+ mutex_unlock(&nvhdcp->lock);
msleep(1750);
+ mutex_lock(&nvhdcp->lock);
queue_work(nvhdcp->downstream_wq, &nvhdcp->work);
}