aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRakib Mullick <rakib.mullick@gmail.com>2011-12-22 13:46:45 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-12-22 16:32:46 -0500
commit8e04d6d83a8ddbd6d81f497e583b8d15de3c2995 (patch)
tree0d4c2782edd6bc677f8223fa28171997a2e026c4
parent221fd753dd002222b595f8af0e289fff0c9cf5a8 (diff)
staging: gma500: Fix warning in power.c
gma_resume_display() wants 'struct pci_dev *' as it's parameter, so lets pass dev->pdev instead of dev. Fixes the following warning. drivers/staging/gma500/power.c: In function ‘gma_power_begin’: drivers/staging/gma500/power.c:269:3: warning: passing argument 1 of ‘gma_resume_display’ from incompatible pointer type drivers/staging/gma500/power.c:99:13: note: expected ‘struct pci_dev *’ but argument is of type ‘struct drm_device *’ Signed-off-by: Rakib Mullick <rakib.mullick@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/gma500/power.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/gma500/power.c b/drivers/staging/gma500/power.c
index 436fe9733b16..408257038335 100644
--- a/drivers/staging/gma500/power.c
+++ b/drivers/staging/gma500/power.c
@@ -266,7 +266,7 @@ bool gma_power_begin(struct drm_device *dev, bool force_on)
266 ret = gma_resume_pci(dev->pdev); 266 ret = gma_resume_pci(dev->pdev);
267 if (ret == 0) { 267 if (ret == 0) {
268 /* FIXME: we want to defer this for Medfield/Oaktrail */ 268 /* FIXME: we want to defer this for Medfield/Oaktrail */
269 gma_resume_display(dev); 269 gma_resume_display(dev->pdev);
270 psb_irq_preinstall(dev); 270 psb_irq_preinstall(dev);
271 psb_irq_postinstall(dev); 271 psb_irq_postinstall(dev);
272 pm_runtime_get(&dev->pdev->dev); 272 pm_runtime_get(&dev->pdev->dev);