aboutsummaryrefslogtreecommitdiff
path: root/linux-core/drm_stub.c
diff options
context:
space:
mode:
authorJon Smirl <jonsmirl@yahoo.com>2005-06-22 05:49:56 +0000
committerJon Smirl <jonsmirl@yahoo.com>2005-06-22 05:49:56 +0000
commit4152605ea174291f469c0c8a6fc433fd90194e71 (patch)
treeadcd867e68194af22a12a49cb72675495a9386ff /linux-core/drm_stub.c
parent9fb77e869f530f3c9679dd63db07514e2f45efc7 (diff)
Get the power management hooks into the right place so that everything gets
freed correctly.
Diffstat (limited to 'linux-core/drm_stub.c')
-rw-r--r--linux-core/drm_stub.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/linux-core/drm_stub.c b/linux-core/drm_stub.c
index cb6d6c69..2f9a2c32 100644
--- a/linux-core/drm_stub.c
+++ b/linux-core/drm_stub.c
@@ -67,9 +67,6 @@ static int fill_in_dev(drm_device_t * dev, struct pci_dev *pdev,
dev->pdev = pdev;
- if (drm_fb_loaded)
- drm_pm_setup( dev );
-
#ifdef __alpha__
dev->hose = pdev->sysdata;
dev->pci_domain = dev->hose->bus->number;
@@ -97,6 +94,10 @@ static int fill_in_dev(drm_device_t * dev, struct pci_dev *pdev,
dev->driver = driver;
+ if (drm_fb_loaded)
+ if ((retcode = drm_pm_setup( dev )))
+ goto error_out_unreg;
+
if (dev->driver->preinit)
if ((retcode = dev->driver->preinit(dev, ent->driver_data)))
goto error_out_unreg;