diff options
| author | Thomas Hellstrom <unichrome@shipmail.org> | 2004-12-07 12:18:47 +0000 |
|---|---|---|
| committer | Thomas Hellstrom <unichrome@shipmail.org> | 2004-12-07 12:18:47 +0000 |
| commit | 98d01f9542d7f70aa10d68c0e41e631b5f156770 (patch) | |
| tree | 3fc635433c6dd9c858b877ca2f5ffb8e7b94cb23 /linux-core | |
| parent | bf6eb1c0d47e670658c42e439434c0c25caabcfb (diff) | |
Patch from Jon Smirl from Nov. 2nd that makes older X servers behave well
with linux-core. Without this, they will fail on their second
invocation since the drm already has a busID assigned.
Submitted by: Jon Smirl
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/drm_drv.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c index cf09528c..fbebe23c 100644 --- a/linux-core/drm_drv.c +++ b/linux-core/drm_drv.c @@ -153,6 +153,12 @@ int drm_takedown(drm_device_t * dev) down(&dev->struct_sem); del_timer(&dev->timer); + if (dev->unique) { + drm_free(dev->unique, strlen(dev->unique) + 1, DRM_MEM_DRIVER); + dev->unique = NULL; + dev->unique_len = 0; + } + /* Clear pid list */ for (i = 0; i < DRM_HASH_SIZE; i++) { for (pt = dev->magiclist[i].head; pt; pt = next) { |