git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_pm.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_pm.c
b/drivers/gpu/drm/nouveau/nouveau_pm.c
index
f05c0cd
..
4399e2f
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_pm.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_pm.c
@@
-543,7
+543,7
@@
nouveau_pm_resume(struct drm_device *dev)
struct nouveau_pm_engine *pm = &dev_priv->engine.pm;
struct nouveau_pm_level *perflvl;
- if (pm->cur == &pm->boot)
+ if (
!pm->cur ||
pm->cur == &pm->boot)
return;
perflvl = pm->cur;