This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / char / drm / drm_agpsupport.h

diff --git a/drivers/char/drm/drm_agpsupport.h b/drivers/char/drm/drm_agpsupport.h
index 8b3439f..2abb7fa 100644 (file)
--- a/drivers/char/drm/drm_agpsupport.h
+++ b/drivers/char/drm/drm_agpsupport.h
@@ -103,7 +103,13 @@ int DRM(agp_acquire)(struct inode *inode, struct file *filp,
        drm_device_t     *dev    = priv->dev;
        int              retcode;
 
-       if (!dev->agp || dev->agp->acquired || !drm_agp->acquire)
+       if (!dev->agp)
+               return -ENODEV;
+       if (dev->agp->acquired)
+               return -EBUSY;
+       if (!drm_agp->acquire)
+               return -EINVAL;
+       if ( dev->agp->cant_use_aperture )
                return -EINVAL;
        if ((retcode = drm_agp->acquire()))
                return retcode;