re: kern/40029 (PCI Matrox G450 vs. mgadrm(4) -> panic)

[matthew green <mrg%eterna.com.au@localhost>]

we don't call the function to remove sysctl on error.  i'll
see about replicating the failure mode and testing the obvious
fix..


.mrg.


Index: drm_drv.c
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c,v
retrieving revision 1.18
diff -p -r1.18 drm_drv.c
*** drm_drv.c   6 Dec 2009 22:51:25 -0000       1.18
--- drm_drv.c   19 Oct 2010 01:22:44 -0000
*************** static int drm_load(struct drm_device *d
*** 659,667 ****
        return 0;
  
  error:
- #if defined(__FreeBSD__)
        drm_sysctl_cleanup(dev);
- #endif
        DRM_LOCK();
        drm_lastclose(dev);
        DRM_UNLOCK();
--- 659,665 ----
*************** static void drm_unload(struct drm_device
*** 685,692 ****
  
        DRM_DEBUG("\n");
  
- #if defined(__FreeBSD__)
        drm_sysctl_cleanup(dev);
        destroy_dev(dev->devnode);
  #endif
  
--- 683,690 ----
  
        DRM_DEBUG("\n");
  
        drm_sysctl_cleanup(dev);
+ #if defined(__FreeBSD__)
        destroy_dev(dev->devnode);
  #endif