1 files changed, 4 insertions, 10 deletions

diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index 16f3ec579b3b..327ca19cda85 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -203,7 +203,7 @@ EXPORT_SYMBOL(drm_master_put);
 int drm_setmaster_ioctl(struct drm_device *dev, void *data,
                         struct drm_file *file_priv)
 {
-        int ret;
+        int ret = 0;
 
         if (file_priv->is_master)
                 return 0;
@@ -229,7 +229,7 @@ int drm_setmaster_ioctl(struct drm_device *dev, void *data,
         }
         mutex_unlock(&dev->struct_mutex);
 
-        return 0;
+        return ret;
 }
 
 int drm_dropmaster_ioctl(struct drm_device *dev, void *data,
@@ -451,14 +451,8 @@ void drm_put_dev(struct drm_device *dev)
 
         drm_lastclose(dev);
 
-        if (drm_core_has_MTRR(dev) && drm_core_has_AGP(dev) &&
-            dev->agp && dev->agp->agp_mtrr >= 0) {
-                int retval;
-                retval = mtrr_del(dev->agp->agp_mtrr,
-                                  dev->agp->agp_info.aper_base,
-                                  dev->agp->agp_info.aper_size * 1024 * 1024);
-                DRM_DEBUG("mtrr_del=%d\n", retval);
-        }
+        if (drm_core_has_MTRR(dev) && drm_core_has_AGP(dev) && dev->agp)
+                arch_phys_wc_del(dev->agp->agp_mtrr);
 
         if (dev->driver->unload)
                 dev->driver->unload(dev);