diff options
| author |   Dave Airlie <airlied@redhat.com> | 2014-03-18 19:23:22 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-03-18 19:23:22 +1000 |
| commit | 5a08c07526e9586318c5b57fd90af4350f83e26e (patch) | |
| tree | 14a93206e71a98ec2f26a05c0edc0ce40cae0e5a /drivers/gpu/drm/drm_pci.c | |
| parent | drm/cma: remove to make sg_table when gem cma is created (diff) | |
| parent | drm: Fix use-after-free in the shadow-attache exit code (diff) | |
| download | linux-dev-5a08c07526e9586318c5b57fd90af4350f83e26e.tar.xz linux-dev-5a08c07526e9586318c5b57fd90af4350f83e26e.zip | |
Merge branch 'topic/core-stuff' of git://git.freedesktop.org/git/drm-intel into drm-next
Merge straggling core drm patches.
* 'topic/core-stuff' of git://git.freedesktop.org/git/drm-intel:
drm: Fix use-after-free in the shadow-attache exit code
drm/fb-helper: Do the 'max_conn_count' zero check
drm: Check if the allocation has succeeded before dereferencing newmode
drm/fb-helper: Use drm_fb_helper_restore_fbdev_mode() in drm_fb_helper_set_par()
drm/edid: request HDMI underscan by default
Diffstat (limited to 'drivers/gpu/drm/drm_pci.c')
| -rw-r--r-- | drivers/gpu/drm/drm_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index 9ded847b05b4..9c696a5ad74d 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c @@ -468,8 +468,8 @@ void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver) } else { list_for_each_entry_safe(dev, tmp, &driver->legacy_dev_list, legacy_dev_list) { - drm_put_dev(dev); list_del(&dev->legacy_dev_list); + drm_put_dev(dev); } } DRM_INFO("Module unloaded\n"); |