summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorLeif Delgass <ldelgass@users.sourceforge.net>2003-04-21 16:07:17 +0000
committerLeif Delgass <ldelgass@users.sourceforge.net>2003-04-21 16:07:17 +0000
commit46e06192a88834a97257d2be5ab3aa7c325a1cfe (patch)
tree3a77c3f79e6415aaff35c6fbd22f256269ced8a0 /linux-core
parentda35a90d99cf56a8ffc48f87754013d13e1cafcd (diff)
Check for NULL map before calling DRM(ioremapfree) on cleanup. Prevents an
oops if a map wasn't found (e.g. XFree86 Bugzilla #108)
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/i810_dma.c3
-rw-r--r--linux-core/i830_dma.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/linux-core/i810_dma.c b/linux-core/i810_dma.c
index b0a1b6aa..c06fd915 100644
--- a/linux-core/i810_dma.c
+++ b/linux-core/i810_dma.c
@@ -263,7 +263,8 @@ static int i810_dma_cleanup(drm_device_t *dev)
for (i = 0; i < dma->buf_count; i++) {
drm_buf_t *buf = dma->buflist[ i ];
drm_i810_buf_priv_t *buf_priv = buf->dev_private;
- DRM(ioremapfree)(buf_priv->kernel_virtual, buf->total);
+ if ( buf_priv->kernel_virtual && buf->total )
+ DRM(ioremapfree)(buf_priv->kernel_virtual, buf->total);
}
}
return 0;
diff --git a/linux-core/i830_dma.c b/linux-core/i830_dma.c
index 1018fdcb..b76d2b11 100644
--- a/linux-core/i830_dma.c
+++ b/linux-core/i830_dma.c
@@ -280,7 +280,8 @@ static int i830_dma_cleanup(drm_device_t *dev)
for (i = 0; i < dma->buf_count; i++) {
drm_buf_t *buf = dma->buflist[ i ];
drm_i830_buf_priv_t *buf_priv = buf->dev_private;
- DRM(ioremapfree)(buf_priv->kernel_virtual, buf->total);
+ if ( buf_priv->kernel_virtual && buf->total )
+ DRM(ioremapfree)(buf_priv->kernel_virtual, buf->total);
}
}
return 0;