Fix for agpgart module detection. If the kernel module has been configured

    to use AGP, and the module is not present, fail gracefully instead of
    doing evil things.

diff --git a/linux-core/r128_drv.c b/linux-core/r128_drv.c
index 8b66988..4c06555 100644 (file)
--- a/linux-core/r128_drv.c
+++ b/linux-core/r128_drv.c
@@ -369,6 +369,13 @@ int r128_init(void)
 
 #ifdef DRM_AGP
        dev->agp    = drm_agp_init();
+       if (dev->agp == NULL) {
+               DRM_ERROR("Cannot initialize agpgart module.\n");
+               drm_proc_cleanup();
+               misc_deregister(&r128_misc);
+               r128_takedown(dev);
+               return -ENOMEM;
+       }
 
 #ifdef CONFIG_MTRR
        dev->agp->agp_mtrr = mtrr_add(dev->agp->agp_info.aper_base,

diff --git a/linux/r128_drv.c b/linux/r128_drv.c
index 8b66988..4c06555 100644 (file)
--- a/linux/r128_drv.c
+++ b/linux/r128_drv.c
@@ -369,6 +369,13 @@ int r128_init(void)
 
 #ifdef DRM_AGP
        dev->agp    = drm_agp_init();
+       if (dev->agp == NULL) {
+               DRM_ERROR("Cannot initialize agpgart module.\n");
+               drm_proc_cleanup();
+               misc_deregister(&r128_misc);
+               r128_takedown(dev);
+               return -ENOMEM;
+       }
 
 #ifdef CONFIG_MTRR
        dev->agp->agp_mtrr = mtrr_add(dev->agp->agp_info.aper_base,