From bca93fbf88344f5373b7ac4c5bd04eeffb289c72 Mon Sep 17 00:00:00 2001 From: Rakib Mullick Date: Fri, 23 Dec 2011 00:46:45 +0600 Subject: [PATCH] --- yaml --- r: 281411 b: refs/heads/master c: 8e04d6d83a8ddbd6d81f497e583b8d15de3c2995 h: refs/heads/master i: 281409: 3bea085b770059e920c5859b42bee2ba06f49fb5 281407: 08f12033c13b8df0aa3ccdeffcdeec8febe9e4fb v: v3 --- [refs] | 2 +- trunk/drivers/staging/gma500/power.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8dd455d1d681..90baaa59922c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 221fd753dd002222b595f8af0e289fff0c9cf5a8 +refs/heads/master: 8e04d6d83a8ddbd6d81f497e583b8d15de3c2995 diff --git a/trunk/drivers/staging/gma500/power.c b/trunk/drivers/staging/gma500/power.c index 436fe9733b16..408257038335 100644 --- a/trunk/drivers/staging/gma500/power.c +++ b/trunk/drivers/staging/gma500/power.c @@ -266,7 +266,7 @@ bool gma_power_begin(struct drm_device *dev, bool force_on) ret = gma_resume_pci(dev->pdev); if (ret == 0) { /* FIXME: we want to defer this for Medfield/Oaktrail */ - gma_resume_display(dev); + gma_resume_display(dev->pdev); psb_irq_preinstall(dev); psb_irq_postinstall(dev); pm_runtime_get(&dev->pdev->dev);