drm_core_ioremapfree( dev_priv->ring_map, dev );
}
- if ( dev->agp_buffer_map )
+ if ( dev->agp_buffer_map ) {
drm_core_ioremapfree( dev->agp_buffer_map, dev );
+ dev->agp_buffer_map = NULL;
+ }
mach64_destroy_freelist( dev );
drm_core_ioremapfree( dev_priv->warp, dev );
if ( dev_priv->primary != NULL )
drm_core_ioremapfree( dev_priv->primary, dev );
- if ( dev->agp_buffer_map != NULL )
+ if ( dev->agp_buffer_map != NULL ) {
drm_core_ioremapfree( dev->agp_buffer_map, dev );
+ dev->agp_buffer_map = NULL;
+ }
if ( dev_priv->head != NULL ) {
mga_freelist_cleanup( dev );
drm_core_ioremapfree( dev_priv->cce_ring, dev );
if ( dev_priv->ring_rptr != NULL )
drm_core_ioremapfree( dev_priv->ring_rptr, dev );
- if ( dev->agp_buffer_map != NULL )
+ if ( dev->agp_buffer_map != NULL ) {
drm_core_ioremapfree( dev->agp_buffer_map, dev );
+ dev->agp_buffer_map = NULL;
+ }
} else
#endif
{
#if __REALLY_HAVE_AGP
if (dev_priv->flags & CHIP_IS_AGP) {
- if ( dev_priv->cp_ring != NULL )
+ if ( dev_priv->cp_ring != NULL ) {
drm_core_ioremapfree( dev_priv->cp_ring, dev );
- if ( dev_priv->ring_rptr != NULL )
+ dev_priv->cp_ring = NULL;
+ }
+ if ( dev_priv->ring_rptr != NULL ) {
drm_core_ioremapfree( dev_priv->ring_rptr, dev );
- if ( dev->agp_buffer_map != NULL )
+ dev_priv->ring_rptr = NULL;
+ }
+ if ( dev->agp_buffer_map != NULL ) {
drm_core_ioremapfree( dev->agp_buffer_map, dev );
+ dev->agp_buffer_map = NULL;
+ }
} else
#endif
{
{
drm_radeon_private_t *dev_priv = dev->dev_private;
int ret;
- DRM_DEBUG("dev_priv %ptr\n", dev_priv);
if (dev_priv) {
dev_priv = DRM(alloc)( sizeof(drm_radeon_private_t), DRM_MEM_DRIVER );
if ( dev_priv == NULL )
return DRM_ERR(ENOMEM);
- DRM_DEBUG("dev_priv %ptr\n", dev_priv);
memset( dev_priv, 0, sizeof(drm_radeon_private_t) );
dev->dev_private = (void *)dev_priv;
drm_core_ioremapfree( dev_priv->ring_map, dev );
}
- if ( dev->agp_buffer_map )
+ if ( dev->agp_buffer_map ) {
drm_core_ioremapfree( dev->agp_buffer_map, dev );
+ dev->agp_buffer_map = NULL;
+ }
mach64_destroy_freelist( dev );
drm_core_ioremapfree( dev_priv->warp, dev );
if ( dev_priv->primary != NULL )
drm_core_ioremapfree( dev_priv->primary, dev );
- if ( dev->agp_buffer_map != NULL )
+ if ( dev->agp_buffer_map != NULL ) {
drm_core_ioremapfree( dev->agp_buffer_map, dev );
+ dev->agp_buffer_map = NULL;
+ }
if ( dev_priv->head != NULL ) {
mga_freelist_cleanup( dev );
drm_core_ioremapfree( dev_priv->cce_ring, dev );
if ( dev_priv->ring_rptr != NULL )
drm_core_ioremapfree( dev_priv->ring_rptr, dev );
- if ( dev->agp_buffer_map != NULL )
+ if ( dev->agp_buffer_map != NULL ) {
drm_core_ioremapfree( dev->agp_buffer_map, dev );
+ dev->agp_buffer_map = NULL;
+ }
} else
#endif
{
#if __REALLY_HAVE_AGP
if (dev_priv->flags & CHIP_IS_AGP) {
- if ( dev_priv->cp_ring != NULL )
+ if ( dev_priv->cp_ring != NULL ) {
drm_core_ioremapfree( dev_priv->cp_ring, dev );
- if ( dev_priv->ring_rptr != NULL )
+ dev_priv->cp_ring = NULL;
+ }
+ if ( dev_priv->ring_rptr != NULL ) {
drm_core_ioremapfree( dev_priv->ring_rptr, dev );
- if ( dev->agp_buffer_map != NULL )
+ dev_priv->ring_rptr = NULL;
+ }
+ if ( dev->agp_buffer_map != NULL ) {
drm_core_ioremapfree( dev->agp_buffer_map, dev );
+ dev->agp_buffer_map = NULL;
+ }
} else
#endif
{
{
drm_radeon_private_t *dev_priv = dev->dev_private;
int ret;
- DRM_DEBUG("dev_priv %ptr\n", dev_priv);
if (dev_priv) {
dev_priv = DRM(alloc)( sizeof(drm_radeon_private_t), DRM_MEM_DRIVER );
if ( dev_priv == NULL )
return DRM_ERR(ENOMEM);
- DRM_DEBUG("dev_priv %ptr\n", dev_priv);
memset( dev_priv, 0, sizeof(drm_radeon_private_t) );
dev->dev_private = (void *)dev_priv;