diff options
| author | Min-wuk Lee <mlee@nvidia.com> | 2011-05-24 19:50:17 +0900 |
|---|---|---|
| committer | Niket Sirsi <nsirsi@nvidia.com> | 2011-05-25 12:37:07 -0700 |
| commit | 0a121ff7e20459cb5557610524dd485ce2b9ce5d (patch) | |
| tree | 091fb9346c7feb09584616cc9962fbb213302d25 /drivers | |
| parent | 0d770bce38c7af6c548cd3c15628c970d35ed7ec (diff) | |
ARM: tegra: dc: fix mutex lock in reset worker
unlock mutex if reset worker finds the display disabled.
Bug 801463
Reviewed-on: http://git-master/r/29898
(cherry picked from commit 672459efb81140b496e3749f1b1b14dcf84af74d)
Change-Id: I94254fca387cddcd58166757e46422167ed9262d
Reviewed-on: http://git-master/r/32758
Reviewed-by: Min-wuk Lee <mlee@nvidia.com>
Tested-by: Min-wuk Lee <mlee@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/tegra/dc/dc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c index b18739b424f2..3f91005b6575 100644 --- a/drivers/video/tegra/dc/dc.c +++ b/drivers/video/tegra/dc/dc.c @@ -1476,7 +1476,7 @@ static void tegra_dc_reset_worker(struct work_struct *work) mutex_lock(&dc->lock); if (dc->enabled == false) - return; + goto unlock; dc->enabled = false; @@ -1521,6 +1521,7 @@ static void tegra_dc_reset_worker(struct work_struct *work) _tegra_dc_controller_enable(dc); dc->enabled = true; +unlock: mutex_unlock(&dc->lock); mutex_unlock(&shared_lock); } |