patch-2.4.5 linux/drivers/pci/setup-res.c

Next file: linux/drivers/pcmcia/i82365.c
Previous file: linux/drivers/pci/setup-irq.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.4/linux/drivers/pci/setup-res.c linux/drivers/pci/setup-res.c
@@ -115,12 +115,13 @@
 		 * window (it will just not perform as well).
 		 */
 		if (!(res->flags & IORESOURCE_PREFETCH) || pci_assign_bus_resource(bus, dev, res, size, min, 0, i) < 0) {
-			printk(KERN_ERR "PCI: Failed to allocate resource %d for %s\n", i, dev->name);
+			printk(KERN_ERR "PCI: Failed to allocate resource %d(%lx-%lx) for %s\n",
+			       i, res->start, res->end, dev->slot_name);
 			return -EBUSY;
 		}
 	}
 
-	DBGC(("  got res[%lx:%lx] for resource %d of %s\n", res->start,
+	DBGC((KERN_ERR "  got res[%lx:%lx] for resource %d of %s\n", res->start,
 						res->end, i, dev->name));
 
 	return 0;
@@ -164,7 +165,7 @@
 			if (r_size > size) {
 				tmp = kmalloc(sizeof(*tmp), GFP_KERNEL);
 				if (!tmp) {
-					printk("pdev_sort_resources(): kmalloc() failed!\n");
+					printk(KERN_ERR "pdev_sort_resources(): kmalloc() failed!\n");
 					continue;
 				}
 				tmp->next = ln;
@@ -184,7 +185,7 @@
 	u16 cmd;
 	int i;
 
-	DBGC(("PCI enable device: (%s)\n", dev->name));
+	DBGC((KERN_ERR "PCI enable device: (%s)\n", dev->name));
 
 	pci_read_config_word(dev, PCI_COMMAND, &cmd);
 
@@ -229,5 +230,5 @@
 	/* Enable the appropriate bits in the PCI command register.  */
 	pci_write_config_word(dev, PCI_COMMAND, cmd);
 
-	DBGC(("  cmd reg 0x%x\n", cmd));
+	DBGC((KERN_ERR "  cmd reg 0x%x\n", cmd));
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)