diff --git a/src/device/device_util.c b/src/device/device_util.c
index 8860859..22c3db1 100644
--- a/src/device/device_util.c
+++ b/src/device/device_util.c
@@ -883,6 +883,13 @@
 
 	best = *best_p;
 
+	/*
+	 * If resource is not allocated any space i.e. size is zero,
+	 * then do not consider this resource in tolm calculations.
+	 */
+	if (new->size == 0)
+		return;
+
 	if (!best || (best->base > new->base))
 		best = new;
 
@@ -893,9 +900,9 @@
 {
 	struct resource *min = NULL;
 	u32 tolm;
+	unsigned long mask_match = IORESOURCE_MEM | IORESOURCE_ASSIGNED;
 
-	search_bus_resources(bus, IORESOURCE_MEM, IORESOURCE_MEM,
-			     tolm_test, &min);
+	search_bus_resources(bus, mask_match, mask_match, tolm_test, &min);
 
 	tolm = 0xffffffffUL;