diff options
| author | Ian Romanick <idr@us.ibm.com> | 2005-10-14 01:25:38 +0000 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2005-10-14 01:25:38 +0000 |
| commit | 1505e316afc68da0167c1d2db1a862ac580c65f1 (patch) | |
| tree | c26407139477dcdec64178dcc95c6ef2ca2c0117 | |
| parent | 725e329cb2aa93812e3e622a6cf2c92c0fffde9d (diff) | |
Fixed a cut-and-paste bug that could cause an oops in mga_do_cleanup_dma
when mga_do_init_dma fails. Still trying to determine why
mga_do_init_dma is failing.
Signed-off-by: Ian Romanick <idr@us.ibm.com>
| -rw-r--r-- | shared-core/mga_dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shared-core/mga_dma.c b/shared-core/mga_dma.c index c61ba1aa..6cc36543 100644 --- a/shared-core/mga_dma.c +++ b/shared-core/mga_dma.c @@ -925,8 +925,8 @@ static int mga_do_cleanup_dma(drm_device_t * dev) if (dev->dev_private) { drm_mga_private_t *dev_priv = dev->dev_private; - if ((dev_priv->warp != NULL) - && (dev_priv->mmio->type != _DRM_CONSISTENT)) + if ((dev_priv->warp != NULL) + && (dev_priv->warp->type != _DRM_CONSISTENT)) drm_core_ioremapfree(dev_priv->warp, dev); if ((dev_priv->primary != NULL) |