projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
edad219
)
gma500: Fix Poulsbo suspend/resume crash on devices with SDVO ports
author
Alan Cox
<alan@linux.intel.com>
Mon, 21 May 2012 14:27:44 +0000
(15:27 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Fri, 1 Jun 2012 07:18:24 +0000
(15:18 +0800)
commit
7beff62ee39d3ccf088bb77f61a63037f714d235
upstream.
Reported-by: Guillaume Clément <guillaume@baobob.org>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/gma500/psb_device.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/gma500/psb_device.c
b/drivers/gpu/drm/gma500/psb_device.c
index
95d163e
..
328a193
100644
(file)
--- a/
drivers/gpu/drm/gma500/psb_device.c
+++ b/
drivers/gpu/drm/gma500/psb_device.c
@@
-197,7
+197,8
@@
static int psb_save_display_registers(struct drm_device *dev)
}
list_for_each_entry(connector, &dev->mode_config.connector_list, head)
- connector->funcs->save(connector);
+ if (connector->funcs->save)
+ connector->funcs->save(connector);
mutex_unlock(&dev->mode_config.mutex);
return 0;
@@
-235,7
+236,8
@@
static int psb_restore_display_registers(struct drm_device *dev)
crtc->funcs->restore(crtc);
list_for_each_entry(connector, &dev->mode_config.connector_list, head)
- connector->funcs->restore(connector);
+ if (connector->funcs->restore)
+ connector->funcs->restore(connector);
mutex_unlock(&dev->mode_config.mutex);
return 0;