summaryrefslogtreecommitdiff
path: root/shared-core/r128_cce.c
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2003-04-23 02:20:25 +0000
committerIan Romanick <idr@us.ibm.com>2003-04-23 02:20:25 +0000
commit189ad4f724036aeb37ef4e7b5b7d25e3f3250bd8 (patch)
treee59c024f2cfc4d93630697065b9d2c4dcf070b35 /shared-core/r128_cce.c
parente9cced1b969aff998c5747f531f9cf7428f88bc7 (diff)
Merge from trunk.texmem-0-0-1
Diffstat (limited to 'shared-core/r128_cce.c')
-rw-r--r--shared-core/r128_cce.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/shared-core/r128_cce.c b/shared-core/r128_cce.c
index 7f0f43254..ad03f4f9d 100644
--- a/shared-core/r128_cce.c
+++ b/shared-core/r128_cce.c
@@ -619,9 +619,12 @@ int r128_do_cleanup_cce( drm_device_t *dev )
#if __REALLY_HAVE_SG
if ( !dev_priv->is_pci ) {
#endif
- DRM_IOREMAPFREE( dev_priv->cce_ring );
- DRM_IOREMAPFREE( dev_priv->ring_rptr );
- DRM_IOREMAPFREE( dev_priv->buffers );
+ if ( dev_priv->cce_ring != NULL )
+ DRM_IOREMAPFREE( dev_priv->cce_ring );
+ if ( dev_priv->ring_rptr != NULL )
+ DRM_IOREMAPFREE( dev_priv->ring_rptr );
+ if ( dev_priv->buffers != NULL )
+ DRM_IOREMAPFREE( dev_priv->buffers );
#if __REALLY_HAVE_SG
} else {
if (!DRM(ati_pcigart_cleanup)( dev,