summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorArto Merilainen <amerilainen@nvidia.com>2013-05-23 10:05:17 +0300
committerDan Willemsen <dwillemsen@nvidia.com>2013-09-14 13:26:04 -0700
commitb190510d5a25ee8f1a2533bd128e0e2161f63aed (patch)
tree0f35f4af234a8235d8257b4f218de90016ae5af3 /drivers/video
parent5dd9656c110b4b6a34fa6130e78bc45d16f310dd (diff)
video: tegra: host: Fix suspend in scale3d
The new devfreq allows having an active devfreq without having an active governor. The old code assumed that having an active devfreq equals having an active governor - which lead to usage of bad NULL pointers. This patch adds necessary checks. Bug 1296920 Change-Id: I77cd7cd43c7c4e0141e60beedeb83effd7d89640 Signed-off-by: Arto Merilainen <amerilainen@nvidia.com> Reviewed-on: http://git-master/r/232002 Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/tegra/host/gr3d/pod_scaling.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/tegra/host/gr3d/pod_scaling.c b/drivers/video/tegra/host/gr3d/pod_scaling.c
index 3d740df6ec4b..5602ca94bfec 100644
--- a/drivers/video/tegra/host/gr3d/pod_scaling.c
+++ b/drivers/video/tegra/host/gr3d/pod_scaling.c
@@ -219,7 +219,7 @@ void nvhost_scale3d_suspend(struct platform_device *dev)
mutex_lock(&df->lock);
podgov = df->data;
- if (!podgov->enable) {
+ if (!(podgov && podgov->enable)) {
mutex_unlock(&df->lock);
return;
}