- patches.fixes/patch-2.6.11-rc1: 2.6.11-rc1.

[linux-flexiantxendom0-3.2.10.git] / drivers / char / agp / alpha-agp.c

diff --git a/drivers/char/agp/alpha-agp.c b/drivers/char/agp/alpha-agp.c
index edca77d..8b7ed6b 100644 (file)
--- a/drivers/char/agp/alpha-agp.c
+++ b/drivers/char/agp/alpha-agp.c
@@ -195,6 +195,8 @@ alpha_core_agp_setup(void)
 
 static int __init agp_alpha_core_init(void)
 {
+       if (agp_off)
+               return -EINVAL;
        if (alpha_mv.agp_info)
                return alpha_core_agp_setup();
        return -ENODEV;