mga_dma: return 'err' not just zero from mga_do_cleanup_dma()

[sfrench/cifs-2.6.git] / drivers / char / drm / mga_dma.c

diff --git a/drivers/char/drm/mga_dma.c b/drivers/char/drm/mga_dma.c
index c567c34cda78e27582bcff4a2e562178e62e23a3..9d95f6078764e2d1a26a0c4b2616fd419fadf80f 100644 (file)
--- a/drivers/char/drm/mga_dma.c
+++ b/drivers/char/drm/mga_dma.c
@@ -493,7 +493,7 @@ static int mga_do_agp_dma_bootstrap(struct drm_device * dev,
                          dma_bs->agp_size);
                return err;
        }
-       
+
        dev_priv->agp_size = agp_size;
        dev_priv->agp_handle = agp_req.handle;
 
@@ -550,7 +550,7 @@ static int mga_do_agp_dma_bootstrap(struct drm_device * dev,
        {
                struct drm_map_list *_entry;
                unsigned long agp_token = 0;
-               
+
                list_for_each_entry(_entry, &dev->maplist, head) {
                        if (_entry->map == dev->agp_buffer_map)
                                agp_token = _entry->user_token;
@@ -964,7 +964,7 @@ static int mga_do_cleanup_dma(struct drm_device *dev, int full_cleanup)
 
                                free_req.handle = dev_priv->agp_handle;
                                drm_agp_free(dev, &free_req);
-       
+
                                dev_priv->agp_textures = NULL;
                                dev_priv->agp_size = 0;
                                dev_priv->agp_handle = 0;
@@ -998,7 +998,7 @@ static int mga_do_cleanup_dma(struct drm_device *dev, int full_cleanup)
                }
        }
 
-       return 0;
+       return err;
 }
 
 int mga_dma_init(struct drm_device *dev, void *data,