From 2bac39b44fd4d4717e97319e8db7950563128fa7 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 21 May 2012 15:27:44 +0100 Subject: [PATCH] --- yaml --- r: 307469 b: refs/heads/master c: 7beff62ee39d3ccf088bb77f61a63037f714d235 h: refs/heads/master i: 307467: 73b2dfa68551dd575efcf3bff96d2f6fd83a57ab v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/gma500/psb_device.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index aac896cf6da5..bc941cc722e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc794829141f28e14fe7d0e07e35870bd9aee78c +refs/heads/master: 7beff62ee39d3ccf088bb77f61a63037f714d235 diff --git a/trunk/drivers/gpu/drm/gma500/psb_device.c b/trunk/drivers/gpu/drm/gma500/psb_device.c index 2a3e2da4ea8e..eff039bf92d4 100644 --- a/trunk/drivers/gpu/drm/gma500/psb_device.c +++ b/trunk/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;