diff --git a/device/device.c b/device/device.c
index 76ecc8a0dd..2a0d251294 100644
--- a/device/device.c
+++ b/device/device.c
@@ -292,9 +292,10 @@ static void read_resources(struct bus *bus)
 		int i;
 		printk(BIOS_SPEW,
 		       "%s: %s(%s) dtsname %s have_resources %d enabled %d\n",
-		       __func__, bus->dev->dtsname, dev_path(bus->dev),
-		       curdev->dtsname,
-		       curdev->have_resources, curdev->enabled);
+			__func__, bus->dev? bus->dev->dtsname : "NOBUSDEV", 
+			bus->dev ? dev_path(bus->dev) : "NOBUSDEV",
+			curdev->dtsname,
+			curdev->have_resources, curdev->enabled);
 		if (curdev->have_resources) {
 			continue;
 		}
@@ -469,10 +470,6 @@ void compute_allocate_resource(struct bus *bus, struct resource *bridge,
 		 * they have no size. PCI bridge resources are a good example
 		 * of this.
 		 */
-		/* Propagate the resource alignment to the bridge register. */
-		if (resource->align > bridge->align) {
-			bridge->align = resource->align;
-		}
 
 		/* Make certain we are dealing with a good minimum size. */
 		size = resource->size;
@@ -481,6 +478,11 @@ void compute_allocate_resource(struct bus *bus, struct resource *bridge,
 			align = min_align;
 		}
 
+		/* Propogate the resource alignment to the bridge register  */
+		if (align > bridge->align) {
+			bridge->align = align;
+		}
+
 		if (resource->flags & IORESOURCE_FIXED) {
 			continue;
 		}