# HG changeset patch # User kz151634 # Date 1163484261 28800 # Node ID 93b86481091a4c97f8e15142171621e444e5fc10 # Parent e4293e8671d8f7cf84d18d3dfd8ee9bb321779b3 6487609 vgatext_get_pci_reg_index failing to find a reg entry leads to panic in i915_sun_attach diff -r e4293e8671d8 -r 93b86481091a usr/src/uts/i86pc/io/drm/i915_sundrv.c --- a/usr/src/uts/i86pc/io/drm/i915_sundrv.c Mon Nov 13 22:02:07 2006 -0800 +++ b/usr/src/uts/i86pc/io/drm/i915_sundrv.c Mon Nov 13 22:04:21 2006 -0800 @@ -341,12 +341,14 @@ if (softc->agp_master != NULL) agpmaster_detach(&softc->agp_master); - /* free PCI config access handle */ - pci_config_teardown(softc->pci_cfg_hdlp); + if (softc->pci_cfg_hdlp) { + /* free PCI config access handle */ + pci_config_teardown(softc->pci_cfg_hdlp); - /* free PCI configuration handle */ - kmem_free((void *)softc->pci_cfg_hdlp, - (sizeof (ddi_acc_handle_t))); + /* free PCI configuration handle */ + kmem_free((void *)softc->pci_cfg_hdlp, + (sizeof (ddi_acc_handle_t))); + } /* graphics misc module detach */ (void) gfxp_vgatext_detach(devi, DDI_DETACH, softc->ds_gfx);