diff --git a/[refs] b/[refs] index a2dff6ff7671..f9974482fbbf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1377998eede7a8caa124fcf6a589b02c9e2bac7 +refs/heads/master: 50d44a523759c39af1119285a5396ca387288af0 diff --git a/trunk/drivers/gpu/drm/gma500/power.c b/trunk/drivers/gpu/drm/gma500/power.c index 994f66935499..8d23c45b5bc6 100644 --- a/trunk/drivers/gpu/drm/gma500/power.c +++ b/trunk/drivers/gpu/drm/gma500/power.c @@ -102,9 +102,6 @@ static void gma_resume_display(struct pci_dev *pdev) struct drm_device *dev = pci_get_drvdata(pdev); struct drm_psb_private *dev_priv = dev->dev_private; - if (dev_priv->suspended == false) - return; - /* turn on the display power island */ dev_priv->ops->power_up(dev); dev_priv->suspended = false;