r506 - trunk/openbios-devel/drivers

Author: blueswirl
Date: 2009-07-11 14:20:20 +0200 (Sat, 11 Jul 2009)
New Revision: 506

Modified:
   trunk/openbios-devel/drivers/pci.c
Log:
Revert r505

Modified: trunk/openbios-devel/drivers/pci.c
===================================================================
--- trunk/openbios-devel/drivers/pci.c	2009-07-05 18:32:50 UTC (rev 505)
+++ trunk/openbios-devel/drivers/pci.c	2009-07-11 12:20:20 UTC (rev 506)
@@ -747,19 +747,24 @@

if (class == PCI_BASE_CLASS_BRIDGE &&
                             (subclass == PCI_SUBCLASS_BRIDGE_HOST ||
-                             subclass == PCI_SUBCLASS_BRIDGE_PCI)) {
+                             subclass == PCI_SUBCLASS_BRIDGE_PCI))
                             REGISTER_NAMED_NODE(ob_pci_bus_node, config.path);
-                            /* host or bridge */
-                            activate_device(config.path);
-                            ob_pci_add_properties(addr, pci_dev, &config);
-                            free(*path);
-                            *path = strdup(config.path);
-                        } else {
+                        else
                             REGISTER_NAMED_NODE(ob_pci_simple_node, config.path);
-                            activate_device(config.path);
-                            ob_pci_configure(addr, &config, mem_base, io_base);
-                            ob_pci_add_properties(addr, pci_dev, &config);
-                        }
+
+			activate_device(config.path);
+
+                        ob_pci_configure(addr, &config, mem_base, io_base);
+			ob_pci_add_properties(addr, pci_dev, &config);
+
+                        if (class == PCI_BASE_CLASS_BRIDGE &&
+                            (subclass == PCI_SUBCLASS_BRIDGE_HOST ||
+                             subclass == PCI_SUBCLASS_BRIDGE_PCI)) {
+				/* host or bridge */
+				free(*path);
+				*path = strdup(config.path);
+			}
+
    	}
    }
    device_end();