diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-01-16 03:15:03 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-01-16 10:42:08 +0100 |
| commit | 4e87f2dd9bc258c85b2f3bb1a100b49927fbe6f3 (patch) | |
| tree | 96c82edf20e2c28e8fc4d97438d00e3b18b8afe9 /drivers/video/tegra/host/nvhost_acm.c | |
| parent | fe4c58c4b96a24aba8e27956e8158b3002723b17 (diff) | |
| parent | c7460e0d6afd754ebf5555477129579bc83c47b9 (diff) | |
Merge remote-tracking branch 'remotes/nvidia/l4t/l4t-r16-r2' into tegra-next
(tegra-l4t-r16-16.5)
Conflicts:
drivers/media/video/tegra_v4l2_camera.c
drivers/mmc/host/sdhci.c
drivers/watchdog/tegra_wdt.c
include/media/tegra_v4l2_camera.h
Diffstat (limited to 'drivers/video/tegra/host/nvhost_acm.c')
| -rw-r--r-- | drivers/video/tegra/host/nvhost_acm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/tegra/host/nvhost_acm.c b/drivers/video/tegra/host/nvhost_acm.c index f22c91ac03f1..860ce6b35572 100644 --- a/drivers/video/tegra/host/nvhost_acm.c +++ b/drivers/video/tegra/host/nvhost_acm.c @@ -3,7 +3,7 @@ * * Tegra Graphics Host Automatic Clock Management * - * Copyright (c) 2010-2012, NVIDIA Corporation. All rights reserved. + * Copyright (c) 2010-2014, NVIDIA Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -221,6 +221,7 @@ void nvhost_module_busy(struct nvhost_device *dev) dev->refcount++; if (dev->refcount > 0 && !nvhost_module_powered(dev)) to_state_running_locked(dev); + mutex_unlock(&dev->lock); } |