diff options
| author | Jon Mayo <jmayo@nvidia.com> | 2011-04-29 15:08:56 -0700 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-05-03 01:20:22 -0700 |
| commit | 672459efb81140b496e3749f1b1b14dcf84af74d (patch) | |
| tree | cb7a9bd44a6b17ae396064bd1a80fb40f1b6f09b /drivers | |
| parent | 99d4df29293eb91551457688bb3674378bb6b429 (diff) | |
ARM: tegra: dc: fix mutex lock in reset worker
unlock mutex if reset worker finds the display disabled.
Bug 801463
Change-Id: I22bff26b5b72e75f0c46efb68446ec2257e8273f
Reviewed-on: http://git-master/r/29898
Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
Tested-by: Jonathan Mayo <jmayo@nvidia.com>
Reviewed-by: Michael I Gold <gold@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 fe68a66aaa04..b12ec7331a6a 100644 --- a/drivers/video/tegra/dc/dc.c +++ b/drivers/video/tegra/dc/dc.c @@ -1509,7 +1509,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; @@ -1554,6 +1554,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); } |