Re: [PATCH] agpgart splitup and cleanup for 2.5.25

[Greg KH <greg@kroah.com>]

Dave Jones found a bug in this patch that causes the driver to try to
bind to multiple busses :(

This patch seems to fix this problem.

thanks,

greg k-h


diff -Nru a/drivers/char/agp/agpgart_be.c b/drivers/char/agp/agpgart_be.c
--- a/drivers/char/agp/agpgart_be.c	Fri Jul 12 14:57:41 2002
+++ b/drivers/char/agp/agpgart_be.c	Fri Jul 12 14:57:41 2002
@@ -47,7 +47,7 @@
 EXPORT_SYMBOL(agp_backend_acquire);
 EXPORT_SYMBOL(agp_backend_release);
 
-struct agp_bridge_data agp_bridge;
+struct agp_bridge_data agp_bridge = { type: NOT_SUPPORTED };
 static int agp_try_unsupported __initdata = 0;
 
 int agp_backend_acquire(void)
@@ -1593,6 +1593,11 @@
 static int agp_probe (struct pci_dev *dev, const struct pci_device_id *ent)
 {
 	int ret_val;
+
+	if (agp_bridge.type != NOT_SUPPORTED) {
+		printk (KERN_DEBUG "Oops, don't init a 2nd agpgard device.\n");
+		return -ENODEV;
+	}
 
 	ret_val = agp_backend_initialize(dev);
 	if (ret_val) {