Skip to contentSkip to conversation

region_request - sh/pci_sh7751.c

PATCH In review Ron Gage 2 participants 2 messages Feb 4, 2006 – Feb 20, 2006 Kernel janitors

lore
Share & tools
lore

Ron Gage

author
#0 lore raw

PATCH 1/1 region_request - sh/pci_sh7751.c

This patch adds return value checking to request_region. No other structural changes included... Using kmail->message->insert file to post patch.

diff -ur linux-2.6.15.orig/arch/sh/drivers/pci/pci-sh7751.c linux-2.6.15/arch/sh/drivers/pci/pci-sh7751.c
--- linux-2.6.15.orig/arch/sh/drivers/pci/pci-sh7751.c 2006-02-04
11:00:10.000000000 -0500
+++ linux-2.6.15/arch/sh/drivers/pci/pci-sh7751.c 2006-02-04
10:54:11.000000000 -0500
@@ -142,9 +142,12 @@
tmp = inl (PCI_REG(SH7751_PCIPAR));
outl (0x80000000, PCI_REG(SH7751_PCIPAR));
if (inl (PCI_REG(SH7751_PCIPAR)) == 0x80000000) {
+ struct resource *region;
outl (tmp, PCI_REG(SH7751_PCIPAR)); printk(KERN_INFO "PCI: Using configuration type 1\n");
- request_region(PCI_REG(SH7751_PCIPAR), 8, "PCI conf1");
+ region = request_region(PCI_REG(SH7751_PCIPAR), 8, "PCI conf1");
+ if (!region)
+ return -EBUSY;
return 0;
}
outl (tmp, PCI_REG(SH7751_PCIPAR));

Signature · 3 lines
Ron Gage 
(LPIC1, MCP, A+, Net+)
Westland Michigan

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors

#1 lore raw
Quoted 4 lines · Ron Gage
arch/sh/drivers/pci/pci-sh7751.c +0 -0
@@ -142,9 +142,12 @@
 		tmp = inl (PCI_REG(SH7751_PCIPAR));

arch/sh/drivers/pci/pci-sh7751.c line 151

Quoted 10 lines
arch/sh/drivers/pci/pci-sh7751.c +4 -1
 		outl (0x80000000, PCI_REG(SH7751_PCIPAR));
 		if (inl (PCI_REG(SH7751_PCIPAR)) == 0x80000000) {
+			struct resource *region;
 			outl (tmp, PCI_REG(SH7751_PCIPAR));
 			printk(KERN_INFO "PCI: Using configuration type 1\n");
-			request_region(PCI_REG(SH7751_PCIPAR), 8, "PCI conf1");
+			region = request_region(PCI_REG(SH7751_PCIPAR), 8, "PCI conf1");
+			if (!region)
+				return -EBUSY;
 			return 0;

Why are you adding new variable?

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors