diff --git a/[refs] b/[refs]
index f5b30f9280a5..87bb2acedb52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3236a1173222ca209d20bb29f6c1cd3499aa845
+refs/heads/master: a96ca105a68bc66c564accdfeb81c36e1d5d46b3
diff --git a/trunk/drivers/char/drm/mga_dma.c b/trunk/drivers/char/drm/mga_dma.c
index 04998b741cad..9d95f6078764 100644
--- a/trunk/drivers/char/drm/mga_dma.c
+++ b/trunk/drivers/char/drm/mga_dma.c
@@ -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,