diff options
author | Dave Airlie <airlied@linux.ie> | 2008-03-06 05:26:23 +1000 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2008-03-06 05:26:23 +1000 |
commit | e00dea812ddb9b483de9f58f7a7aa7105427512d (patch) | |
tree | 9ffef663b16a3c444ea9a294d635be4e81e6fe99 /linux-core/drm_stub.c | |
parent | f78cdac8e512642db1aaf09bf9178e23ede25586 (diff) | |
parent | 12574590cdf7871755d1939463ca6898251fd0d1 (diff) |
Merge branch 'master' of ../../drm into modesetting-101
Conflicts:
linux-core/drmP.h
linux-core/drm_drv.c
linux-core/drm_proc.c
linux-core/drm_stub.c
linux-core/drm_sysfs.c
Diffstat (limited to 'linux-core/drm_stub.c')
-rw-r--r-- | linux-core/drm_stub.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linux-core/drm_stub.c b/linux-core/drm_stub.c index 6856075b..ba13e5e5 100644 --- a/linux-core/drm_stub.c +++ b/linux-core/drm_stub.c @@ -355,6 +355,10 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent, if ((ret = dev->driver->load(dev, ent->driver_data))) goto err_g5; + if (dev->driver->load) + if ((ret = dev->driver->load(dev, ent->driver_data))) + goto err_g4; + DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n", driver->name, driver->major, driver->minor, driver->patchlevel, driver->date, dev->primary->index); |