More differentiated error codes for DRM(agp_acquire)

Obtained from: Linux kernel

diff --git a/linux-core/drm_agpsupport.c b/linux-core/drm_agpsupport.c
index 0f281b5..f83651a 100644 (file)
--- a/linux-core/drm_agpsupport.c
+++ b/linux-core/drm_agpsupport.c
@@ -104,7 +104,11 @@ 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;
 #ifndef VMAP_4_ARGS
        if ( dev->agp->cant_use_aperture )

diff --git a/linux/drm_agpsupport.h b/linux/drm_agpsupport.h
index 0f281b5..f83651a 100644 (file)
--- a/linux/drm_agpsupport.h
+++ b/linux/drm_agpsupport.h
@@ -104,7 +104,11 @@ 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;
 #ifndef VMAP_4_ARGS
        if ( dev->agp->cant_use_aperture )